Some sanitization for comments

No functionality change, just being sure to push everything in before
the grand pull from master.