Minor rearrangement of GeomSvc hoping it will run faster