Index: addr.fs
==================================================================
--- addr.fs
+++ addr.fs
@@ -127,17 +127,19 @@
     host:key @ dest-0key< !
     host:portv4 w@ sockaddr1 port be-w!
     host:ipv4 be-ul@ sockaddr1 ipv4!
     host:route $@ !temp-addr ;
 
-: addr>sock6 { xt -- }
-    ipv6( host:ipv6 ip6?   IF  addr>6sock o o> >r xt execute  r> >o THEN ) ;
-: addr>sock4 { xt -- }
-    ipv4( host:ipv4 be-ul@ IF  addr>4sock o o> >r xt execute  r> >o THEN ) ;
-
 : addr>sock ( o xt -- ) { xt } >o
-    ipv64( xt addr>sock6 xt addr>sock4 )else( xt addr>sock4 xt addr>sock6 ) o> ;
+    ipv64(
+    ipv6( host:ipv6 ip6?   IF  addr>6sock o o> >r xt execute  r> >o THEN )
+    ipv4( host:ipv4 be-ul@ IF  addr>4sock o o> >r xt execute  r> >o THEN )
+    )else(
+    ipv4( host:ipv4 be-ul@ IF  addr>4sock o o> >r xt execute  r> >o THEN )
+    ipv6( host:ipv6 ip6?   IF  addr>6sock o o> >r xt execute  r> >o THEN )
+    )
+    o> ;
 
 : +my-id ( -- )
     config:prio# @ host:pri# !
     host$ $@ host:id $!
     my-0key @ IF  my-0key sec@ host:key sec!  THEN ;

Index: msg.fs
==================================================================
--- msg.fs
+++ msg.fs
@@ -527,19 +527,18 @@
 : msg-dec?-sig? ( addr u -- addr' u' flag )
     2dup 2 - + c@ $80 and IF  msg-dec-sig?  ELSE  msg-sig?  THEN ;
 
 : replace-sig { addrsig usig addrmsg umsg -- }
     addrsig usig addrmsg umsg usig - [: type type ;] $tmp
-    2dup dump
     2dup msg-dec?-sig? !!sig!! 2drop addrmsg umsg smove ;
 : new-otrsig ( addr u flag -- addrsig usig )
     >r 2dup startdate@ old>otr
     predate-key keccak# c:key@ c:key# smove
     [: sktmp pkmod sk@ drop >modkey .encsign-rest ;]
     ['] .sig r@ select $tmp
     2dup + 2 - r> swap orc!
-    2dup dump 1 64s /string ;
+    ( 2dup dump ) 1 64s /string ;
 
 :noname { sig u' addr u -- }
     u' 64'+ u =  u sigsize# = and IF
 	last# >r last# $@ >group
 	addr u startdate@ 64dup date>i >r 64#1 64+ date>i' r>