Fix up comments.  Remove unused consts.