Because I use partial edge control, these cases virtually never come up. When they do, I just use primitive 2 step sequences to fix them. At some point I will learn algs for these cases worthy of posting.