Clean up uniter context a tiny bit.

This is a follow-up to http://reviews.vapour.ws/r/663/.