get rid of final 2 reduce/reduce conflicts!

Yay, a real grammar!