Another pass at context clean up.

@enisoc @aaijazi