@klickverbot I think that Walter's approach is essentially fragile, and it will need continued maintenance, like this PR. So I really don't like this change.