(and also thanks to multiple people for all the extremely patient and helpful feedback on that PR, which can and will be cut down according to daniel's comments)

Hurrah! I'm happy to keep reviewing that one, so give me a shout when it's ready for the next round - is definitely getting close! :)