Ok. I've just come back (done nothing yet).
So, go on with your work without regarding mine.
I'll undo my changes to strings.[ch] and try to use refactor the points calling those two functions there to use xstrdup instead. Maybe later we'll have a pair of conflicts but nothing serious to solve.