tidy cyclic imports

[reidpr]

Split from #1860. Pylint: R0401 cyclic-import

We have quite a few import cycles. In general this is error-prone, so we should probably untangle it.

I recall adding a few more cycles so test/order-py worked???