Cleaned up references to Thing._

Removed a lot of imports, and tightened up others.