VS 15.3 has more features than we recorded in commit 21346d3f. Record them now.
While at it, update comments and simplify some cases.
Topic-rename: features-msvc-2017