More parallelisation optimisations, especially for building binary tree