Patch up comment block preservation to not depend on the original object getting passed from load to save, by reading comment block at write-time. Also removes the need for another YAML serializer.