X-Git-Url: http://nitlanguage.org

diff --git a/src/nit.nit b/src/nit.nit
index 36c3815..2481ce8 100644
--- a/src/nit.nit
+++ b/src/nit.nit
@@ -19,6 +19,7 @@ module nit
 
 import naive_interpreter
 import debugger
+import debugger_socket
 
 # Create a tool context to handle options and paths
 var toolcontext = new ToolContext
@@ -34,7 +35,7 @@ toolcontext.process_options(args)
 # We need a model to collect stufs
 var model = new Model
 # An a model builder to parse files
-var modelbuilder = new ModelBuilder(model, toolcontext.as(not null))
+var modelbuilder = new ModelBuilder(model, toolcontext)
 
 var arguments = toolcontext.option_context.rest
 var progname = arguments.first
@@ -56,8 +57,8 @@ else
 	mainmodule.set_imported_mmodules(mmodules)
 end
 
-var self_mm = mainmodule.as(not null)
-var self_args = arguments.as(not null)
+var self_mm = mainmodule
+var self_args = arguments
 
 if toolcontext.opt_debugger_autorun.value then
 	modelbuilder.run_debugger_autorun(self_mm, self_args)