Minor cleanups, and some better comments.