#1795 Use ArrayList to build collection of keys in removeAll, instead of HashSet