Remove a couple more gendered pronouns

This pull request is an addendum to #2766. For future reference, this is the updated command I used to search for gendered pronouns:

    ag '(\W|^)(he|him|his|she|her|hers|himself|herself)(\W|$)'

I’ve also taken this opportunity to remove/add trailing whitespace where it is appropriate. This was done in a separate commit, so you can cherry-pick if you don’t want to merge it.

See also: http://blogobaggins.com/2009/03/31/waging-war-on-whitespace.html