@twobraids and I discussed in IRC and he rescinded his objection - the refactor appears to not functionally change anything, whether or not it's what the code *should* do is a matter for further discussion :)