Fixing the support for language independent fields in dexteritym + some cleanup.