Minor changes
Split up unescapedVariableParser and made tagParser an umbrella parser