Fixing a concurrency bug that could cause problem now that we are using ConcurrentHashMap for overloaded method lookups.