Expanded Grammar for Detecting Equivalence in Math Expressions