                 return;
             }
 
-            go(TOR_ADDRESS, TOR_PORT);
+            tor_addr = DEFAULT_TOR_ADDR;
+
+            go();
         }
 
         /* We connect first to the Tor relay; once that happens we connect to
            the facilitator to get a client address; once we have the address
            of a waiting client then we connect to the client and BAM! we're in business. */
-        private function go(tor_address:String, tor_port:int):void
+        private function go():void
         {
             s_t = new Socket();
 

        private function loaderinfo_complete(e:Event):void
        {
            var fac_spec:String;

            puts("Parameters loaded.");
            fac_spec = this.loaderInfo.parameters["facilitator"];

        private var s_c:Socket;

        private var fac_addr:Object;
        private var tor_addr:Object;

        private function puts(s:String):void
        {
