More general CONTENT regexp, as suggested by Aidan Hobson Sayers.

All regression tests pass.
Typo fix.
NEWS update.
Fix command line usage
Enforce uniform coding style - no space bwtween function and left arg (.

All regression tests pass.
Clean up after the last change.