Cleanup, comments, and other miscellany.