[mkgmap-dev] Commit r4542: minor code improvements