It turns out that exophase had already suggested two of the three optimisations I implemented this weekend in a conversation we had way back in February.
Whoops! It's been such a long time, I'd totally forgotten we'd talked about it. I really should pay more attention sometimes - if I had been you might have seen some of these improvements way back in R9. Sorry exophase - kudos for spotting this so long ago!