Various minor code and comment cleanups.