diff --git a/acvisitor.d b/acvisitor.d
index 469042b..8165c61 100644
--- a/acvisitor.d
+++ b/acvisitor.d
@@ -33,8 +33,6 @@ import messages;
 import modulecache;
 import autocomplete;
 
-// TODO: a lot of duplicated code
-
 /**
  * Converts an AST into a simple symbol and scope heirarchy so that the
  * autocompletion coed can do its job more easily.
diff --git a/dscanner b/dscanner
index 80c2462..be54827 160000
--- a/dscanner
+++ b/dscanner
@@ -1 +1 @@
-Subproject commit 80c2462445a937eaf339890edf4282c4e6878d08
+Subproject commit be54827b4e2b2bc7035763ea4e1cd981ccbc459e