More grammar work:

 o The comment didn't really do much, so remove them.
 o Put expression productions in ascending order of precendence.
 o Add missing link to Torbjörn's modified grammar.