Checkpoint while debugging 51.water.

See the TEMP comment areas within parse.py.

Looks like an add_subst is failing at _inner_4 (created within the run
of 51.water).

Note that base_grammar is not quite aligned with layer2 just now.