Final file tidies for 10.33.

16 files changed