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