Exactly correct.  For example, CPP is a Canadian public pension plan that is over-funded.  The actuary reports have labelled CPP as funded beyond 75 years when it is supposed to be funded TO 75 years.  The actuaries are using current demographic projections that  more than account for the aging population and longer life spans.  Secondly, OAS is already a means tested benefit.