Take the first baby step towards unifying and cleaning up arminit():

• Pull all the code to deal with the trampoline stuff into one

	  centeralized place and use it from everywhere.

• Some minor style tidiness

Reviewed by: tinguely