Created an issue #2029 to keep track of this. There were some subtleties involved so I'd rather be able to focus on that in a separate issue.