Bug fixes and helper function

* Don't use the same data literal everywhere
* Useful helper function for converting codes
New schema

Mostly back to where we were before, but with far more data for each
form.