Fix desugaring errors caught by -dcore-lint.