Updates types in grammar to better match what we want