Make the removal skips a bit more robust.