Index: src/cui_auto_main.d
==================================================================
--- src/cui_auto_main.d
+++ src/cui_auto_main.d
@@ -7,11 +7,11 @@
 class CUI(Solver) : GameObserver
 {
 	this(in Game g) { solver = new Solver(g); }
 	Solver solver;
 	bool fin;
-	override void on_game_changed(char c, const(Game) g, bool finished)
+	override void on_game_changed(char c, in Game g, bool finished)
 	{
 		fin = finished;
 	}
 }
 

Index: src/gui.d
==================================================================
--- src/gui.d
+++ src/gui.d
@@ -29,11 +29,11 @@
 			this.closing ~= (Form f,CancelEventArgs c){t.stop();};
 		}
 		Application.run(this);
 	}
 
-	override void on_game_changed(char c, const(Game) g, bool finished)
+	override void on_game_changed(char c, in Game g, bool finished)
 	{
 		draw(g);
 	}
 
 private:
@@ -79,11 +79,11 @@
 		this.paint ~= (Control c, PaintEventArgs ev) {
 			graphicContext.copyTo(ev.graphics, Rect(0,0,this.clientSize.width,this.clientSize.height));
 		};
 	}
 
-	void draw(const(Game) g)
+	void draw(in Game g)
 	{
 		int scrW = this.clientSize.width;
 		int scrH = this.clientSize.height;
 
 		// Fill bg.

Index: src/solver.d
==================================================================
--- src/solver.d
+++ src/solver.d
@@ -1,16 +1,7 @@
 import util;
 import game;
-import driver;
-
-/*
-interface Solver
-{
-	this(const(Game) g);
-	char single_step();
-}
-*/
 
 class Solver_0
 {
 	this(const(Game) g) {}
 	char single_step() { return 'W'; }