Changed diversity to uniformity.
Changed bin_fun/un_fun to binary_fn/unary_fn.