Null merge with 3.3.

There are enough new things to make the merge harder than making the
change in VS, and there are other things to add filters for in 3.4.