Update code after the newcancel branch was merged in Tulip.