clean cpi classes

I don't think I can make those asny simpler / nicer - so, cpi's are
(structurally) declared complete.