[mkgmap-dev] Commit r4508: minor code improvements, no change in output expected