Further refinements to the distribution check.