Fix up trailing whitespace introduced by r310190. While there, fix a couple of earlier whitespace errors as well.