source tidying, rationalization of operator arg order.