OK let's try to start this cleanup; the slight non-determinism in the VELO aside, this gives me identical results to master. @dcampora @raaij @plfernan @dovombru