Added instead-of cutpoint and test.