Big changes in the way the class env is built: clearer and more passes