anchor.diff:  			 end;
   		     (_, Env) -> Env
   		 end, Env0, Fbs0),
  -    {Fbs1,St1} = expand_clauses(Fbs0, Env1, St0),
  -    {B1,St2} = expand_tail(B0, Env1, St1),
  +    {Fbs1,St1} = exp_clauses(Fbs0, Env1, St0),
  +    {B1,St2} = exp_tail(B0, Env1, St1),
       {Fbs1,B1,St2}.
   
  -%% expand_let_macro(MacroBindings, Body, Env, State) -> {Expansion,State}.
  +%% exp_let_macro(MacroBindings, Body, Env, State) -> {Expansion,State}.
   %%  Expand a let_syntax. We add the actual macro binding to the env as
   %%  we may need them while expanding the body.
   
  -expand_let_macro(Mbs, B0, Env0, St0) ->
  +exp_let_macro(Mbs, B0, Env0, St0) ->
       %% Add the macro defs from expansion and return body in a progn.
       Env1 = foldl(fun ([Name,['lambda'|_]=Def], Env) when is_atom(Name) ->
   			 add_mbinding(Name, Def, Env);
  
positive.code: %%  Expand all the macros in an expression.
  
  expand_expr_all(F, Env) ->
      {Ef,_} = expand(F, Env, #mac{expand=true}),
      Ef.
  
  %% expand_forms(FileForms, Env) ->
  
negative.code: 	case exp_macro(E0, Env, St0) of
  	    {yes,_,_}=Yes -> Yes;
  	    no when Expand ->			%Expand all if flag set.
  		{E1,St1} = exp_form(E0, Env, St0),
  		{no,E1,St1};
  	    no -> {no,E0,St0}
  	end
  