Extend and clean up AABB and related APIs