Cutting out circular imports as far as possible