[mkgmap-dev] Commit r4514: minor code simplifications, no change in output intended