Finally fix (I think) that intermittent glitch-on-stop regression...