Get rid of the t.c.contextutil dep entirely.

- Cleaned up a stray use in code that got committed after my previous change.
- Also cleaned up style in that code. Will ding code-reviewer for not addressing.
- Fixed some missing deps.