Some trailing whitespace tidying.

Oh, the joy of multiline regular expressions.