It becomes a challenge. With my better fix, all test pass except two - pos/gadts and run/gadts. Because they're, you know, unsound. I can play with it a little longer. But I think some variation on this PR might be the best I can do, because there are really two different issues at play and this one can (and should) be addressed even if the deeper one isn't.