A few extra fixes for degenerate removal