Refactor unescaped mustaches again