Cosmetic changes fixup

f0543d6 heavily revised to flow and error control of the script
cosmetic_changes.  However a bug meant the changes made by the
change methods were discarded.

Change-Id: I2adecb09876bdf64ff4e9e03dd095368fa6135b2
Merge "Cosmetic changes fixup"