changed grammar to match (mostly) the noted changes in the alternative syntax.