anchor.diff:        _ -> Options
       end,
     {ok, Bin} = file:read_file(InFile),
  -  compile_string(binary_to_list(Bin), Options2).
  -
  -compile_stream(Stream) -> compile_stream(Stream, []).
  -
  -compile_stream(Stream, Options) ->
  +  template_string(binary_to_list(Bin), Options2).
  +
  +template_stream(Stream) -> template_stream(Stream, []).
  +
  +template_stream(Stream, Options) ->
     Str = io:get_chars(Stream, "", 1024000),
  -  compile_string(Str, Options).
  -
  -compile_string(Str) -> compile_string(Str, []).
  -
  -compile_string(Str, Options) ->
  +  template_string(Str, Options).
  +
  +template_string(Str) -> template_string(Str, []).
  +
  +template_string(Str, Options) ->
     Options2 = other_options(Options),
     AST = zml_indent:tokenize_string(Str), % TODO: pass options here
     AST2 = run_specialized_handlers(AST, Options2),
  -  Template = translate_ast_item(AST2, []),
  -  zml_render:render(Template,
  -    proplists:get_value(data, Options2, fake)).
  -
  -render_string(Str, Data) -> render_string(Str, Data, []).
  -
  -render_string(Str, Data, Options) ->
  -  compile_string(Str, [{data, Data} | Options]).
  +  translate_ast_item(AST2, []).
  +
  +
  +render(Template) -> render(Template, fake).
  +
  +render(Template, Data) -> zml_render:render(Template, Data).
  +
  +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
   other_options(Options) ->
     case ?OPT_ENV(zml_zss_libs) of
  
positive.code: 
  % Main function
  -export([
      compile_file/1,
      compile_file/2,
      compile_files/0,
      compile_files/1,
      compile_stream/1,
      compile_stream/2,
      compile_string/1,
      compile_string/2
    ]).
  
  % Utilities for special handlers:
  
negative.code:     _ -> []
    end ++
    Options.
  
  
  run_specialized_handlers(AST, Options) ->
  