The straight-template-relocation portion of #192