Refactor `trim_utf8_file` method.
Minimize spaces in templates.
Refactor comment template joins, and also fix e9708351.