More cleanup removing hard-coded "Normal" from code. Most of this commit
is cleaning up comments.