Start cleaning up the trampolines at least a little bit.

And related hacks.