Simplify calls to random:uniform
Merge branch 'master' into orddict-deltas