[mkgmap-dev] Commit r4131: refactoring, no functional change