Minor cleanup

Start to factor out a GeometryUpdater base class.