Removing Array/Dictionary containers in favour of categories on NSArray/Set/Dictionary