Comment 17 for bug 1847532

OK. Maybe I'm tilting at windmills here with matching destructor idea. @Ian if you'd like to go ahead with the patch you were discussing in #7, it sounds like the best approach discussed so far.