I would not trust Congress to fix this law even with the best intention in the world. (And since there's nothing in it for the members, they could only have benevolent intent.) They are simply not smart enough to do it without screwing it up worse. The SCOTUS could do it - they are at least smart. And there's no room here for their misguided do-gooderism.