terminated with punctuation before the trailing whitespace.  The old
form - trailing punctuation then whitespace - is preserved, but the
punctuation is now unnecessary.

The regular expressions are a bit more complicated, but i've factored
out the common parts and but them in variables with suggestive names,
which may make them easier to understand.