Fixing what looks like a bug in cfi-generating code. Under some circumstances, it created an extra step equal to the last common step.