- A little refactoring of Geometry & WorldMap.