form_wizard: minor cleanup