Improve handling of distributions.