Work toward using .prefix on leaves.

This is in parse.broken.py, and, just as you might guess based on the
file name, it's broken. Specifically, running water on the new parser
freezes. Next up, clearly, is to fix that freeze.