Well, this sucks. Will probably revert a lot of stuff, so I will be back at BVH + kD-tree.