Moved i18n wrapper into formMacros, and out of calls to it - to make things work better