(Resending to the list since I fat-fingered the address the first time...)
Here's the series rebased and squashed down into one commit. Also I
added in the strndup suggestion. Still ignoring the fact that it
breaks the ABI for now until we decide what to do about that.