Implemented JH's changes down to language-class