Moved yet more state into CompilationContext