Follow-up for potentially too few clusters from VPDigits

The following discussion from !626 (merged) should be addressed:

cc: @zexu, @mexu