Simplify grammar by folding things into primary_expression.