Revert "simplify integer CP"

This reverts commit 6b07f0b8244f0b2fa53c818fb5d8cef6c73f389b.
fix assertions

* remove old ones
* prefer the new ones
* update tests