Didn't touch comments where it wasn't obvious that the code adhered to the newer standard.
mentioned in commit cb33e553