Convert the overloading to use the new type equation solver