Removing the income limit without increasing the benefit amount (at least not at the same rate) would be a huge improvement and should be about as simple as any tax change can be.