I agree with you about ending defined benefit. No new public employees should be added to it. 98% of the private sector has already done this.
I do not agree about 100% funding of pension obligations. It would be highly pro cyclical, as pension assets would appreciate without contributions in a boom, but require government cuts or tax increases in a recession.
