I touched more files than you with my huge optimization of the day! Hah! :)

[That's my 47 files to Adam's 42 files in a single commit, for those of you keeping score at home].