BVH: some code clean-up.