Corrected in changeset 168681504.

If you come across a few similar errors, feel free to correct them.   If it looks like I've systematically made this error in loads of places, please let me know, and I'll fire up JOSM at the weekend and work through them.