@zaach Did you want to file a new issue for that bigger refactor and bump it to z-never (or some appropriate milestone)? Or not, whatever, depends on how "off" you think it feels.