Cleaning up the form view controller API a little and adding some additional types.