Changes required by the Typechecker / Compiler optimizations (#793)