Thanks - this matches my recollection.
A remaining problem here (from well before your edit) is that https://www.openstreetmap.org/way/195774187 seems to go across a wall and back, but that's entirely unrelated.
