Fix up the whitespace formatting of hsbencher output tags.
Also add the new custom fields to the hsbencher script for this project.