[mkgmap-dev] Commit: r670: Some more changes that should have been included in the previous