Avoiding degenerate cases (g + s > 1)