Comments / blank space to ease diffing/merging.
Some changes so that Cocotron class doesn't duplicate the whole GenerateClass method.
(Removal of unneeded(no changes) methods from Cocotron)