Changed macro WITH-OPERATION.