anchor.diff:  find_prefix(Pfx, #mod{imports = Imports}) ->
       case orddict:find(Pfx, Imports) of
   	error ->
  -	    false;
  +	    case orddict:find({prefix,Pfx}, Imports) of
  +		error -> false;
  +		{ok, ActualPrefix} ->
  +		    %% The "prefix" was in fact a module name (already expanded)
  +		    orddict:fetch(ActualPrefix, Imports)
  +	    end;
   	{ok, #mod{} = ModI} ->
   	    ModI
       end.
  
positive.code: %% expand_uses([], _, _, _, _) ->
  %%     [].
  
  expand_elems_([{uses,L,U,Ou} = Elem|T], #mod{loop_count = Cnt,
  					     data = Yang,
  					     prefix = OwnPfx,
  					     imports = Imports} = ModR, Ps) ->
      %%?dbg("Elem ~p,~nMod ~p", [Elem, ModR]),
      if Cnt > 1000 -> throw({circular_dependency, [uses, L, U]});
         true -> ok
      end,
  
negative.code:     end;
  expand_elems_([{{<<"$yang">>,_}, _, _, _} = IntStmt |T], ModR, Ps) ->
      [IntStmt | expand_elems_(T, ModR, Ps)];
  expand_elems_([{{Pfx,Extension}, L, Arg, Data} = _Elem|T],
  	      #mod{module = Mod} = ModR, Ps) ->
      %% ?dbg("Elem ~p,~nMod ~p", [Elem, Mod]),
      Mp = case find_prefix(Pfx, ModR) of
  