Whitespace changes.
Minor regexp simplification.