Whitespace tweaks to match JOSM style