Might as well make this not complain by initializing
Validate XML after compositing everything, not in the middle. Have order conform to DTD.
Merge commit '1b8fa746eb32baef392d3b74d53890a009aed036'

Fixes issue from dbport fix
Merge commit '828c75d'

Ensure that composites aren't validated until compositing is done