One more case-splitting fix