Noting ahead of time: it's possible changes made here might not be necessary/a good fit if other changes are made in response to #702, and if so this PR can be ignored.
Relatedly, if other #702-related changes (e.g., reverting to older behavior, and/or adding a new selector argument for how conversion is done) are both desired and easier if just added to this PR, I'd be glad to do that.
Addresses secondary issue mentioned in #702.
Noting ahead of time: it's possible changes made here might not be necessary/a good fit if other changes are made in response to #702, and if so this PR can be ignored.
Relatedly, if other #702-related changes (e.g., reverting to older behavior, and/or adding a new selector argument for how conversion is done) are both desired and easier if just added to this PR, I'd be glad to do that.