Fix incorrect handling of shadowed variables in CP checker.