I agree with means testing, but think it would have to be something that slowly phased in over a long period, and proportionally to smooth discontinuities so that people could shift their behavior to match expectations.