OR may now be chained

The AND operator allowed chaining of any number of AND expressions, but the OR operator did not. This patch fixes that, and moves minor lexical rules out of the way a little.