Fixes #320: Meta-questions not loading from saved forms.

 Also, moving some longer structures out of the larger files