More import/lint cleanup.

This is a follow-on to the last CL (which dropped the `json` wrapper); it's mostly import cleanups, along with a few related things I saw while doing import cleanup.

PTAL @skelterjohn