Some naming improvements.
Fixed dictionaryKey, and changed BOOL to @encode(BOOL) from 'c' to make it more clear.