anchor.diff:  				  {Info1, Ms1};
   			      _ -> {[], {dict:from_list([]), dict:from_list([])}}
   			  end,
  -	    Comments = refac_comment_scan:file(FName, TabWidth),
  -            SyntaxTree = refac_recomment:recomment_forms(Forms, Comments),
  +            SyntaxTree = refac_recomment:recomment_forms(Forms, []),
               Info = refac_syntax_lib:analyze_forms(SyntaxTree),
   	    Info2 = merge_module_info(Info0, Info),
   	    AnnAST0 = annotate_bindings(FName, SyntaxTree, Info2, Ms, TabWidth),
  -	    AnnAST = refac_atom_annotation:type_ann_ast(FName, Info2, AnnAST0, SearchPaths, TabWidth),
  +            AnnAST = refac_atom_annotation:type_ann_ast(FName, Info2, AnnAST0, SearchPaths, TabWidth),
   	    {ok, {AnnAST, Info2}};
   	{error, Reason} -> erlang:error(Reason)
       end;
  
positive.code:     case refac_syntax:type(Node) of
  	variable ->
  	    Len = length(refac_syntax:variable_literal(Node)),
  	    refac_syntax:add_ann({range, {{L, C}, {L, C + Len - 1}}}, Node);
  	atom ->
              case lists:member({L,C}, QAtomPs) of
                  true ->
                      Len = length(atom_to_list(refac_syntax:atom_value(Node))), 
                      Node1 = refac_syntax:add_ann({qatom, true}, Node),
                      refac_syntax:add_ann({range, {{L, C}, {L, C + Len + 1}}}, Node1); 
                  false ->
                      Len = length(atom_to_list(refac_syntax:atom_value(Node))), 
                      refac_syntax:add_ann({range, {{L, C}, {L, C + Len - 1}}}, Node)
  	    end;
          operator ->
  	    Len = length(atom_to_list(refac_syntax:atom_value(Node))),
  	    refac_syntax:add_ann({range, {{L, C}, {L, C + Len - 1}}}, Node);
  	char -> refac_syntax:add_ann({range, {{L, C}, {L, C}}}, Node);
  	integer ->
  	    Len = length(refac_syntax:integer_literal(Node)),
  	    refac_syntax:add_ann({range, {{L, C}, {L, C + Len - 1}}}, Node);
  	string ->
  	    Toks1 = lists:dropwhile(fun (T) -> token_loc(T) < {L, C} end, Toks),
  	    {Toks21, Toks22} = lists:splitwith(fun (T) -> is_string(T) orelse is_whitespace_or_comment(T) end, Toks1),
  
negative.code: 				   'end'),   %% S starts from 'fun', so there is no need to extend forwards/
  	    refac_syntax:add_ann({range, {S, E11}}, Node);
  	arity_qualifier ->
              calc_and_add_range_to_node(Node, arity_qualifier_body, arity_qualifier_argument);
  	implicit_fun ->
                  adjust_implicit_fun_loc(Node, Toks);
          attribute ->
  	    Name = refac_syntax:attribute_name(Node),
  	    Args = refac_syntax:attribute_arguments(Node),
  	    case Args of
  