Add skip support and SHIFT_REPLACEMENT_END.