Fix previous checkins; remove git-inserted comments.
Fixing comments inserted by git