Bug 1098512 - more code cleanup for comments