minor simplification to grammar