Be more explicit about what we’re importing from where

Partly to avoid polluting the current namespace too much but also just
to help me keep track of things.