Default templates for 'comp', 'forw', 'dist', 'repl' now include