Further reorganization of the overloading code.