Comment shuffling, also fixing r86347 CR.