Adapt verify-cps to CPS changes