Removed runtime trickery with simple NSDictionary using classes as keys.