Change strategy for marking < and > as template delimiters: mark them