Fix things I broke with tex refactor

Test Plan:
'ack tmpl' now shows nothing particularly suspicious-looking.

Auditors: eater, emily