Fix comments early, so that check for no changes works right

+ handle another case of overlong comment

Change-Id: Id6424a9e44ba1351396bb7ba994899c088742cb3