Use a better approach for handling source document <defs>.

The original approach would destroy the original <defs>. :( This one
doesn't.
Bump bugfix version.