Fix cyclic import. Imports work, but refernce tracking still doesn't.
wtf.