I have always believed the proper way to fix that is by an initiative:
There Shall be NO Taxpayer Funds used for any Pension, Retirement, or Health Insurance plan of ANY Kind for ANY Public Servant that does not have a Legal Duty to Protect the Citizenry.
problem solved.
Sounds right to me. We don’t have a duty to support them either then.