Sneak in an extra grammar fix or two.

You know, while @ajlanghorn's in there already.