Replace more single-line HTML things with heredocs