anchor.diff:              case Result of
                   {ok, Tokens, _} ->
                       {ok, Term} = erl_parse:parse_term(Tokens),
  -                    consult([], Remaining, [Term | Acc]);
  +                    consult([], Remaining, [maybe_dict(Term) | Acc]);
                   {eof, _Other} ->
                       lists:reverse(Acc);
                   {error, Info, _} ->
  
positive.code:                    undefined ->
                         Context0;
                     File ->
                         case file:consult(File) of
                             {ok, Terms} ->
                                 %% TODO: Cleanup/merge with similar code in rebar_reltool
                                 M = fun(_Key, _Base, Override) -> Override end,
                                 dict:merge(M, Context0, dict:from_list(Terms));
                             {error, Reason} ->
                                 ?ABORT("Unable to load template_vars from ~s: ~p\n",
                                        [File, Reason])
                         end
                 end,
  
  
negative.code: resolve_variables([{Key, Value0} | Rest], Dict) when is_list(Value0) ->
      Value = render(list_to_binary(Value0), Dict),
      resolve_variables(Rest, dict:store(Key, Value, Dict));
  resolve_variables([{Key, {list, Dicts}} | Rest], Dict) when is_list(Dicts) ->
      %% just un-tag it so mustache can use it
      resolve_variables(Rest, dict:store(Key, Dicts, Dict));
  resolve_variables([_Pair | Rest], Dict) ->
      resolve_variables(Rest, Dict).
  
  