Small cleanups to comments and naming.