Simplifying several more routines within GeneralDistMatrix