diff --git a/containers b/containers
index f7fb230..53258c9 160000
--- a/containers
+++ b/containers
@@ -1 +1 @@
-Subproject commit f7fb230db32afd1fc85b242b8112c9fab05fc839
+Subproject commit 53258c939ea7f6871fba93f34c5a5512e31e9f5e
diff --git a/libdparse b/libdparse
index dca3498..27f45e6 160000
--- a/libdparse
+++ b/libdparse
@@ -1 +1 @@
-Subproject commit dca3498b483c8adb7671c1eb4d97186fac3483aa
+Subproject commit 27f45e6490e7ef0e9a6ef604e51f68a54b10ee2d
diff --git a/makefile b/makefile
index 25e37bd..2c2599e 100644
--- a/makefile
+++ b/makefile
@@ -72,6 +72,7 @@ SERVER_SRC = src/actypes.d\
 	containers/src/containers/hashset.d\
 	containers/src/containers/internal/hash.d\
 	containers/src/containers/internal/node.d\
+	containers/src/containers/internal/storage_type.d\
 	containers/src/containers/slist.d\
 	msgpack-d/src/msgpack.d
 
diff --git a/src/conversion/first.d b/src/conversion/first.d
index 8daec21..56f448f 100644
--- a/src/conversion/first.d
+++ b/src/conversion/first.d
@@ -70,9 +70,10 @@ final class FirstPass : ASTVisitor
 	{
 		// Create a dummy symbol because we don't want unit test symbols leaking
 		// into the symbol they're declared in.
-		SemanticSymbol* s = allocateSemanticSymbol("*unittest*",
+		SemanticSymbol* s = allocateSemanticSymbol(internString("*unittest*"),
 			CompletionKind.dummy, null, 0);
 		s.parent = currentSymbol;
+		currentSymbol.addChild(s);
 		currentSymbol = s;
 		u.accept(this);
 		currentSymbol = s.parent;
@@ -384,9 +385,9 @@ final class FirstPass : ASTVisitor
 
 		if (blockStatement.declarationsAndStatements !is null)
 		{
-			currentScope = s;
+		currentScope = s;
 			visit (blockStatement.declarationsAndStatements);
-			currentScope = s.parent;
+		currentScope = s.parent;
 		}
 	}