Pending base grammar change for a+/*b syntax.

This breaks layer2.water, but only because the _inner_X rules are
being re-used between layer1 and layer2.

I need to find a solution that avoids both the layer1/layer2 clash
*and* and potential future clashes within user code. Not yet sure of
the best approach.