Block import cleanups (#4842)
I carried these things in a fork for a long time, I think wouldn't hurt to have it upstream. Originally submitted as part of https://github.com/paritytech/polkadot-sdk/pull/1598 that went nowhere. --------- Co-authored-by:Bastian Köcher <[email protected]>