[CLEANUP] Move end-of-line comments to their own lines.