Further compileToCore improvements