Correctly read in XML, preserving CDATA blocks
Moving support for --prefixed commands to all implementations
More support for options
Render options 'automatically'
Clean up feature envy between builder and merger
Replacing version where necessary
Couple of diff-minimising changes to XML output
More diff-minimisation
Minimise diffs in the Resource version