Now make_base_grammar makes base_grammar (again).

This was temporarily broken as I was changing the rule-update system.
Now it works again, yay! The all_layers.water also serves as a low-level
example of how file includes can happen.