Minor cleanups and comments.