Clean up duplicate markup in template a bit.