Migrated the form widget macros from snippetMacros.html to formMacros.html where they can be more widely used