Remove the whole trampoline thing from makefiles,  I think I was just using the wrong variable type but we'll see if this fails to compile elsewhere
Merge branch 'fix-maybe-fix-makefile-ugly'