Officially start using base_grammar[.cmd].water.

This has gotten rid off close to 100 lines in parse.py.