For the record, what was the resolution?  There's been quite a lot of code change in this area in the past, and it would be good to record (if only in the pull request) what we decided here.