further parser grammar simplifications