All this crap is very brittle due to circular deps and python handling
them badly. This appears to be fixing some stuff, at the very least.

This is sed, so cleanup of imports (which can now be grouped together)
is not done yet.