[Inkscape-devel] Code cleanup in trunk