Remove unused commented out bits of form.
Explanation for 'match' directive.
Whitespace cleanup.