Misc small changes I noticed while preparing patches. In some
cases, I am reverting unnecessary diffs between our branch
and mozilla/master.