anchor.diff:  	    [hipe_rtl:mk_gctest(?PROC_BIN_WORDSIZE + ?SUB_BIN_WORDSIZE),
   	     get_word_integer(Size, SizeReg, SystemLimitLblName, FalseLblName),
   	     allocate_writable(DstVar, Base, SizeReg, Zero, Zero),
  -	     hipe_rtl:mk_goto(TrueLblName)]; 
  -	  
  +	     hipe_rtl:mk_goto(TrueLblName)];
  +
   	  {bs_private_append, _U, _F} ->
  -	    [Size, Bin] = Args, 
  +	    [Size, Bin] = Args,
   	    [DstVar, Base, Offset] = Dst,
   	    [ProcBin] = create_vars(1),
   	    [SubSize, SizeReg, EndSubSize, EndSubBitSize] = create_regs(4),
   	    SubBinSize = {sub_binary, binsize},
  -	    [get_field_from_term({sub_binary, orig}, Bin, ProcBin),
  -	     get_field_from_term(SubBinSize, Bin, SubSize),
  +	    [hipe_tagscheme:get_field_from_term({sub_binary, orig}, Bin, ProcBin),
  +	     hipe_tagscheme:get_field_from_term(SubBinSize, Bin, SubSize),
   	     get_word_integer(Size, SizeReg, SystemLimitLblName, FalseLblName),
   	     realloc_binary(SizeReg, ProcBin, Base),
   	     calculate_sizes(Bin, SizeReg, Offset, EndSubSize, EndSubBitSize),
  -	     set_field_from_term(SubBinSize, Bin, EndSubSize),
  -	     set_field_from_term({sub_binary, bitsize}, Bin, EndSubBitSize),
  +	     hipe_tagscheme:set_field_from_term(SubBinSize, Bin, EndSubSize),
  +	     hipe_tagscheme:set_field_from_term({sub_binary, bitsize}, Bin, EndSubBitSize),
   	     hipe_rtl:mk_move(DstVar, Bin),
   	     hipe_rtl:mk_goto(TrueLblName)]; 
   
   	  {bs_append, _U, _F, Unit, _Bla} ->
  -	    [Size, Bin] = Args, 
  -	    [DstVar, Base, Offset] = Dst, 
  +	    [Size, Bin] = Args,
  +	    [DstVar, Base, Offset] = Dst,
   	    [ProcBin] = create_vars(1),
  -	    [Flags, SizeReg, IsWritable, EndSubSize, EndSubBitSize] = 
  +	    [Flags, SizeReg, IsWritable, EndSubSize, EndSubBitSize] =
   	      create_regs(5),
   	    [ContLbl,ContLbl2,ContLbl3,ContLbl4,WritableLbl,NotWritableLbl] =
   	      Lbls = create_lbls(6),
  
positive.code: make_init_end(Src, CCode, TrueLblName) ->
    [CLbl, SuccessLbl] = create_lbls(2),
    [UntaggedSrc] = create_regs(1),
    Init = [hipe_tagscheme:test_fixnum(Src, hipe_rtl:label_name(SuccessLbl), 
  				     hipe_rtl:label_name(CLbl), 0.99),
  	  SuccessLbl,
  	  hipe_tagscheme:untag_fixnum(UntaggedSrc,Src)],
  
negative.code: is_divisible(_Dividend, 1, SuccLbl, _FailLbl) ->
    [hipe_rtl:mk_goto(SuccLbl)];
  is_divisible(Dividend, Divisor, SuccLbl, FailLbl) ->
    Log2 = hipe_rtl_binary:floorlog2(Divisor),
    case Divisor =:= 1 bsl Log2 of
      true -> %% Divisor is a power of 2
        %% Test that the Log2-1 lowest bits are clear
  