Tweaks to reflect the final N4143 Paper

Also fixes to the randomized thread pool to make it work (seems to be
pretty fast now).