Miscellaneous tidying

https://www.openstreetmap.org/user/tmtm/diary/599