Major changes to grammar based on several ambiguities.  Whiteboards.