Improve the desugaring of -XStrict