Refactor form system / lead-gen forms.