[mkgmap-dev] Commit r4384: code cleanup using hints from sonarlint, no change in output expected