I forget where I saw the math, but I think if you remove the limit and the cap on benefits (so the principle of paying your own way remains), it still improves the health of the Social Security system. Would love to know if that's correct if anyone's found the actual math.