Minor cleanup in aabb_check