Well, I have it another look and confirmed both rings are out. I can see the groove that the circlip sat it and it is clean all the way around. It appears that the washer is stuck. I couldn't tell before that it was in there, but from the parts diagram above as well as my refurb kit, that's my problem. I've hit it with some PB, so we'll see. I tried pulling on the piston with pliers and tried tapping it out from the other end, so it must really be gummed up somehow in there.