Cleaner handling of on-the-fly decoding
Tweak parameter name
Add category on NSDictionary to public interface