Expression grammar more complete without breaking compiler