Replace general entities with XInclude

Removed great big general entities for defining serialization options; use XInclude instead.

Also removed some insignificant whitespace.