More prototype changes for cancelation behavior.