Death to all circular imports (except the ones I haven't killed)