Some cleanup around Chapel Hill, NC, USA

https://api.openstreetmap.org/user/JRM/diary/4541