moving validator definitions to where they make sense logically rather than separating them for some as yet unimplemented i18n functionality.