stop using local rand-range/choose fns, long since fixed upstream in test.check/double-check