Eliminate apply_tpl_vars(), and restore use of _x()