7.x grammar fixes

Very brief changes. Also a comment change that would have bothered me to my grave.