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