Simplify the type grammar