Greatly simplified cps-dep