Remove key sorting. Move from callables to having a match() method.