Avoid ghost u-turns.

I wish this were cleaner.