Integrate cleanups for comments in PR70.