Whew -- I *think* this completes folding in all the new-in-8.1 stuff.

Still need to test it in pathological scenarios.