diff --git a/common/dub.sdl b/common/dub.sdl
index c1f1f6b..908877a 100644
--- a/common/dub.sdl
+++ b/common/dub.sdl
@@ -4,5 +4,5 @@ preGenerateCommands "rdmd \"$PACKAGE_DIR/dubhash.d\""
 sourcePaths "src"
 importPaths "src"
 
-dependency "msgpack-d" version="~>1.0.0-beta.7"
+dependency "msgpack-d" version="1.0.1"
 versions "built_with_dub"
diff --git a/containers b/containers
index a978c3c..f4e7937 160000
--- a/containers
+++ b/containers
@@ -1 +1 @@
-Subproject commit a978c3cda3f6ec3ba7449ec5c08dd5cd4dd79c6e
+Subproject commit f4e79375539554b3793adf1c557361a64a073524
diff --git a/dsymbol b/dsymbol
index 71168a8..f9a3d30 160000
--- a/dsymbol
+++ b/dsymbol
@@ -1 +1 @@
-Subproject commit 71168a8449958e1807a8ba22c8a4df15456bae83
+Subproject commit f9a3d302527a9e50140991562648a147b6f5a78e
diff --git a/dub.json b/dub.json
index d88424a..4109af7 100644
--- a/dub.json
+++ b/dub.json
@@ -1,17 +1,17 @@
 {
   "name": "dcd",
   "description": "The D Completion Daemon is an auto-complete program for the D programming language",
-  "copyright": "Copyright © 2015-2017, Brian Schott",
+  "copyright": "Copyright © 2015-2020, Brian Schott",
   "authors": [
     "Brian Schott"
   ],
   "license": "GPL-3.0",
   "dependencies": {
-    "dsymbol": ">=0.11.0 <0.12.0",
-    "libdparse": ">=0.15.0 <0.16.0",
+    "dsymbol": ">=0.11.2 <0.12.0",
+    "libdparse": ">=0.15.4 <0.16.0",
     ":common": "*",
     "stdx-allocator": "~>2.77.5",
-    "emsi_containers": "~>0.8.0-alpha.15"
+    "emsi_containers": "~>0.8.0-alpha.19"
   },
   "subPackages": ["common"],
   "versions": ["built_with_dub"],
diff --git a/libdparse b/libdparse
index f9a8284..1393ee4 160000
--- a/libdparse
+++ b/libdparse
@@ -1 +1 @@
-Subproject commit f9a82848fe98a84f38a66df950514c3556e7fb2d
+Subproject commit 1393ee4d0c8e50011e641e06d64c429841fb3c2b
diff --git a/msgpack-d b/msgpack-d
index 19d9245..480f3bf 160000
--- a/msgpack-d
+++ b/msgpack-d
@@ -1 +1 @@
-Subproject commit 19d9245e315a85763754ded6912c2375c9226e04
+Subproject commit 480f3bf9ee80ccf6695ed900cfcc1850ba8da991
diff --git a/tests/imports/scope_mess.d b/tests/imports/scope_mess.d
index 56a885e..4776876 100644
--- a/tests/imports/scope_mess.d
+++ b/tests/imports/scope_mess.d
@@ -4,4 +4,7 @@ class FooTest
 {
     void member1() { int b; }
     void member2() in {} do {}
+    void member3() in(true) out(a; true) do {}
+    void member4() out(; things) do {}
+    void member5() do {}
 }
diff --git a/tests/imports/tc620_import.d b/tests/imports/tc620_import.d
new file mode 100644
index 0000000..45a3d7c
--- /dev/null
+++ b/tests/imports/tc620_import.d
@@ -0,0 +1,12 @@
+struct UselessStruct
+{
+    static if (true)
+    {
+        unittest {}
+    }
+
+private:
+
+}
+
+int someNumber;
diff --git a/tests/tc620/expected.txt b/tests/tc620/expected.txt
new file mode 100644
index 0000000..73a40ab
--- /dev/null
+++ b/tests/tc620/expected.txt
@@ -0,0 +1,2 @@
+identifiers
+someNumber	v
diff --git a/tests/tc620/file.d b/tests/tc620/file.d
new file mode 100644
index 0000000..166e016
--- /dev/null
+++ b/tests/tc620/file.d
@@ -0,0 +1 @@
+import tc620_import; some
diff --git a/tests/tc620/run.sh b/tests/tc620/run.sh
new file mode 100755
index 0000000..ea7d14c
--- /dev/null
+++ b/tests/tc620/run.sh
@@ -0,0 +1,5 @@
+set -e
+set -u
+
+../../bin/dcd-client $1 file.d -c25 > actual.txt
+diff actual.txt expected.txt
diff --git a/tests/tc_scope_mess/expected1.txt b/tests/tc_scope_mess/expected1.txt
index 1cb5cf9..9f16d3d 100644
--- a/tests/tc_scope_mess/expected1.txt
+++ b/tests/tc_scope_mess/expected1.txt
@@ -7,6 +7,9 @@ init	k
 mangleof	k
 member1	f
 member2	f
+member3	f
+member4	f
+member5	f
 sizeof	k
 stringof	k
 tupleof	k