Remove most remaining instances of "with (Domplate)"