MFC r267612 (by trasz):
Get rid of unneccessary argument.
MFC r268289:
Fix minor copy-paste bug in r268284.
MFC r268457 (by pluknet):
Fix typos.