RegistryNode: Fix to use dictionaries with same comparison behavior. Minor code cleanups.