Miscellaneous tidying

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