Kill off more redundant template noise.