Fix mustache vars; old method was dumb