The work done in #114 needs a better way to be tested. It's easy to forget to prefix a name, either in the definition or in internal usage.

We are really getting to the point where we might need to start auto-generating some things.