Removed cp-state; uses idefstruct now.