More geometry refactoring.