Fixes to avoid dead-cycle recompilation.
Recompiled using the latest TypeScript.