Grammar simplification, using + instead of having multiple rules.