Start replacing FunctionCall by FunctionCallNew.