We should definitely only do minimal changes in 1.7.1. In 1.8, we can fix this the right way.

Right, I see that I my way of fixing it is confusing. I like your idea @njsmith. I'll try to implement it and see how it goes.