ObjectiveC migration: more migration to
instancetype of NSDictionary methods.