Also fixes a typo reported by AlThePhoenix and removes trailing whitespace. This was SVN commit r17333.