Comment from Sharon Sacco:
"There are commented out code fragments here. Are they reminders of something to fix? From a reader's point of view, these are at best mysterious. Unless they are comments, in which case they should be better written, I would recommend getting rid of them in the public copy."
(Such improvements probably don't require an upstream (OMG) issue due to their non-semantic nature.)