Here's my fix.  Feel free to reopen if you see anything else that needs fixing.
https://www.openstreetmap.org/changeset/160415999

Note that the user that made this mess is banned for 10 years.
https://www.openstreetmap.org/user_blocks/4077