GlobalPoints: minor refactoring