Improved attempt at not double-importing things