Further comment amendments to preserve formatting prior to source reformat