Sort.
Added [NSDictionary dictionaryWithMappedKeysAndMappedValues].
Tidy.