Do non-LEO 6(c) positions (ie firefighter, Air Traffic Control) stop the clock? 5 USC 8412 (d) seems to suggest that they do:

"(1) after completing 25 years of service as a law enforcement officer, member of the Capitol Police or Supreme Court Police, firefighter, nuclear materials...