Bug 2103: Fix hash collisions preventing some switches from registering