simplify types in tdop parser