Tidy up NSArray/Enumeration headers