I’m inclined to make changes along these lines. I’ve opened an issue to keep track: Details still need working out.