issue #20734: Handle default distributions more gracefully.