Further clean up of the source code. Making building ZFormModel simpler, easier to extend.