refactor munge-forms to also provide munge-expr fn