Oops, that was part of a new bug I found while fixing this... I made another PR for it but obviously didn't reset this branch before continuing. The other PR's been merged, so I'll update this branch and fix the conflict. Sorry about that, after the next push should be all good.