[mkgmap-dev] Commit r4539: minor code improvements