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