[mkgmap-dev] Commit r4541: Simplify code, slightly improve performance