Removing parallelism for now.
Sort shapes primarily by mass, and secondarily by degree of freedom. Previously, mass was the secondary sort, and an approximation of degree of freedom was the primary sort.