Merge: lib: some cleanup in *Capable and HashCollections