unfactored out part of grammar that was not redundant