Restore original formatting (mostly), fix skip/lim cond.