Fixed operator overloading so that both method and non-method operator overloads work.