Be able to parse sample11.water.

This is mainly due to fixes in the grammar in that file. In the future, I may
want to consider making it easier for grammar-writers to avoid name conflicts,
as I had accidentally used the mode and rule name 'str' twice, which seems like
an easy mistake to make.