Merge "Use trampolines for calls to helpers"