Another step towards eliminating GeneralBlockDistMatrix