A possible solution to #1668. I'm opening this for discussion, not as something ready to merge - I don't want to spend too much time on the details if the basic idea is no good. Background ...