Make 'op' argument placement consistent