Fix possible bug in `flattenContent'
Add various fixes and clean-ups
Merge branch 'master' of github.com:jonkri/xml-picklers