Smarter delete to avoid another edge case just discovered by Pau.