Commit rewrite before moving to GNUNET_NAT functions