Merge the libraries with suffix "2" up into the corresponding main library.  No
need for that kind of hair-splitting.