Refined the identification of fields so error conditions are unique even with 'repeated' models (such as having two addresses on the same form).