Update _form_wrapper decorator, update _form_as_* methods