Trampoline support and API cleanup