Preliminary clean-up of the language() function