Fix multiple defects after processing Call transforms