Makes sense.  Done.

I'm hoping we stop putting LINKCMD in Environment though because it doesn't really make sense on Windows (see issue 11266).