stbt-templatematch: Cleanup trailing whitespace