Fix a whitespace issue, per Markus.
Add a regression test for the new error around template renaming.