Fix remaining instances of hclustn_>nhclust