Change grammar to better handle negative numbers