Finishing OO redesign of convert and starting into XSLT.