Make ResolverBase.resolve default arguments None safe.