Yeah, definitely not intuitive. I'm not planning to address it in the context of these changes, in the interests of getting a PR out sooner rather than later, but it's open for anyone who wants to.