Switch to using .prefix on parse tree leaves.

Right now {53,57}.water are samples on which water fails. Next up is to
fix water so they work again.