3-year or General Rule for NJ pension exclusion

I've reviewed all questions concerning the 3 year rule and  NJ pensions (teachers) and failed to find future filing guidance for after the employee contribution has been recovered. Am I correct in assuming that I should continue to use the 3 year rule on all future filings and input the same figure in the "Annuity Cost" and "Cost Recovered in Prior Years" fields?