Updated tarmac.
Made use of a couple of new tarmac features.

Same functionality, just some of the code has moved to tarmac for easy
reuse.