[mkgmap-dev] Commit r4516: slightly improve variable names and javadoc