Comment cleanups.