BVH: code clean-up.