[mkgmap-dev] Commit r4531: refactoring, no funnctional change intended