Minor refactor.
Merge branch 'orientedBoundingBox' into declutterForLabels