Properly fix recursive imports.