diff --git a/upptst/Assist/main.cpp b/upptst/Assist/main.cpp
index 72673c1a3..104e1d8ab 100644
--- a/upptst/Assist/main.cpp
+++ b/upptst/Assist/main.cpp
@@ -33,6 +33,11 @@ void Autocomplete()
 	Upp::String
 }
 
+void Autocomplete()
+{
+	Upp::TrimBoth().
+}
+
 using namespace Upp;
 
 void Autocomplete()
@@ -94,8 +99,29 @@ void Autocomplete()
 	p.
 }
 
+struct FooBar {
+	int x;
+};
+
+void Autocomplete()
+{
+	FooBar b;
+	b.
+}
+
+void Autocomplete()
+{
+	::FooBar b;
+	b.
+}
+
 Index<String>& Tags();
 
+void Autocomplete() // TODO
+{
+	::Tags().
+}
+
 void Autocomplete()
 {
 	Tags().