Fix broken circular import loop.