diff --git a/src/eval/eval_parser.c b/src/eval/eval_parser.c
index e273efc1..70c376bb 100644
--- a/src/eval/eval_parser.c
+++ b/src/eval/eval_parser.c
@@ -834,8 +834,8 @@ eval_parse_expr_from_text_tokens__prec(Arena *arena, EVAL_ParseCtx *ctx, String8
           TG_Key                         type_key = zero_struct;
           String8                        local_lookup_string = token_string;
           
-          //- rjf: form namespaceify fallback
-          String8 namespaceified_token_string = token_string;
+          //- rjf: form namespaceified fallback versions of this lookup string
+          String8List namespaceified_token_strings = {0};
           if(ctx->rdbg->procedures != 0 && ctx->rdbg->scopes != 0 && ctx->rdbg->scope_vmap != 0)
           {
             U64 scope_idx = raddbg_vmap_idx_from_voff(ctx->rdbg->scope_vmap, ctx->rdbg->scope_vmap_count, ctx->ip_voff);
@@ -844,23 +844,22 @@ eval_parse_expr_from_text_tokens__prec(Arena *arena, EVAL_ParseCtx *ctx, String8
             RADDBG_Procedure *procedure = &ctx->rdbg->procedures[proc_idx];
             U64 name_size = 0;
             U8 *name_ptr = raddbg_string_from_idx(ctx->rdbg, procedure->name_string_idx, &name_size);
-            String8 name = str8(name_ptr, name_size);
-            U64 past_scope_resolution_pos = 0;
+            String8 containing_procedure_name = str8(name_ptr, name_size);
+            U64 last_past_scope_resolution_pos = 0;
             for(;;)
             {
-              U64 past_next_dbl_colon_pos = str8_find_needle(name, past_scope_resolution_pos, str8_lit("::"), 0)+2;
-              U64 past_next_dot_pos = str8_find_needle(name, past_scope_resolution_pos, str8_lit("."), 0)+1;
+              U64 past_next_dbl_colon_pos = str8_find_needle(containing_procedure_name, last_past_scope_resolution_pos, str8_lit("::"), 0)+2;
+              U64 past_next_dot_pos = str8_find_needle(containing_procedure_name, last_past_scope_resolution_pos, str8_lit("."), 0)+1;
               U64 past_next_scope_resolution_pos = Min(past_next_dbl_colon_pos, past_next_dot_pos);
-              if(past_next_scope_resolution_pos < name.size)
-              {
-                past_scope_resolution_pos = past_next_scope_resolution_pos;
-              }
-              else
+              if(past_next_scope_resolution_pos >= containing_procedure_name.size)
               {
                 break;
               }
+              String8 new_namespace_prefix_possibility = str8_prefix(containing_procedure_name, past_next_scope_resolution_pos);
+              String8 namespaceified_token_string = push_str8f(scratch.arena, "%S%S", new_namespace_prefix_possibility, token_string);
+              str8_list_push_front(scratch.arena, &namespaceified_token_strings, namespaceified_token_string);
+              last_past_scope_resolution_pos = past_next_scope_resolution_pos;
             }
-            namespaceified_token_string = push_str8f(scratch.arena, "%S%S", str8_prefix(name, past_scope_resolution_pos), token_string);
           }
           
           //- rjf: try members
@@ -974,9 +973,11 @@ eval_parse_expr_from_text_tokens__prec(Arena *arena, EVAL_ParseCtx *ctx, String8
               RADDBG_NameMapNode *node = raddbg_name_map_lookup(ctx->rdbg, &parsed_name_map, token_string.str, token_string.size);
               U32 matches_count = 0;
               U32 *matches = raddbg_matches_from_map_node(ctx->rdbg, node, &matches_count);
-              if(matches_count == 0)
+              for(String8Node *n = namespaceified_token_strings.first;
+                  n != 0 && matches_count == 0;
+                  n = n->next)
               {
-                node = raddbg_name_map_lookup(ctx->rdbg, &parsed_name_map, namespaceified_token_string.str, namespaceified_token_string.size);
+                node = raddbg_name_map_lookup(ctx->rdbg, &parsed_name_map, n->string.str, n->string.size);
                 matches_count = 0;
                 matches = raddbg_matches_from_map_node(ctx->rdbg, node, &matches_count);
               }
@@ -1014,9 +1015,11 @@ eval_parse_expr_from_text_tokens__prec(Arena *arena, EVAL_ParseCtx *ctx, String8
               RADDBG_NameMapNode *node = raddbg_name_map_lookup(ctx->rdbg, &parsed_name_map, token_string.str, token_string.size);
               U32 matches_count = 0;
               U32 *matches = raddbg_matches_from_map_node(ctx->rdbg, node, &matches_count);
-              if(matches_count == 0)
+              for(String8Node *n = namespaceified_token_strings.first;
+                  n != 0 && matches_count == 0;
+                  n = n->next)
               {
-                node = raddbg_name_map_lookup(ctx->rdbg, &parsed_name_map, namespaceified_token_string.str, namespaceified_token_string.size);
+                node = raddbg_name_map_lookup(ctx->rdbg, &parsed_name_map, n->string.str, n->string.size);
                 matches_count = 0;
                 matches = raddbg_matches_from_map_node(ctx->rdbg, node, &matches_count);
               }
@@ -1050,9 +1053,11 @@ eval_parse_expr_from_text_tokens__prec(Arena *arena, EVAL_ParseCtx *ctx, String8
               RADDBG_NameMapNode *node = raddbg_name_map_lookup(ctx->rdbg, &parsed_name_map, token_string.str, token_string.size);
               U32 matches_count = 0;
               U32 *matches = raddbg_matches_from_map_node(ctx->rdbg, node, &matches_count);
-              if(matches_count == 0)
+              for(String8Node *n = namespaceified_token_strings.first;
+                  n != 0 && matches_count == 0;
+                  n = n->next)
               {
-                node = raddbg_name_map_lookup(ctx->rdbg, &parsed_name_map, namespaceified_token_string.str, namespaceified_token_string.size);
+                node = raddbg_name_map_lookup(ctx->rdbg, &parsed_name_map, n->string.str, n->string.size);
                 matches_count = 0;
                 matches = raddbg_matches_from_map_node(ctx->rdbg, node, &matches_count);
               }
diff --git a/src/scratch/i_hate_c_plus_plus.cpp b/src/scratch/i_hate_c_plus_plus.cpp
index ac4e9f96..a3ad1e14 100644
--- a/src/scratch/i_hate_c_plus_plus.cpp
+++ b/src/scratch/i_hate_c_plus_plus.cpp
@@ -1,20 +1,21 @@
-#include <fstream>
-
-namespace SomeWeirdNamespace
+namespace NS
 {
-  int X = 0;
-  int Y = 0;
-  void Foo(void)
+  static int X = 123;
+  static int Y = 456;
+  namespace SubNS
   {
-    X = 123;
-    Y = 456;
-    int x = 0;
+    static int X = 111;
+    static int Y = 222;
+    int Foo(int x, int y)
+    {
+      int z = x + y + X + Y + NS::X + NS::Y;
+      return z;
+    }
   }
 }
 
-int main()
+int main(void)
 {
-  std::fstream temp;
-  SomeWeirdNamespace::Foo();
+  int result = NS::SubNS::Foo(5, 6);
   return 0;
 }
diff --git a/src/ui/ui_core.c b/src/ui/ui_core.c
index 73abb6a4..cf902b74 100644
--- a/src/ui/ui_core.c
+++ b/src/ui/ui_core.c
@@ -2443,8 +2443,10 @@ ui_signal_from_box(UI_Box *box)
   B32 keyboard_click = 0;
   if(!disabled && is_focused && box->flags & UI_BoxFlag_KeyboardClickable)
   {
-    if(os_key_press(ui_events(), ui_window(), 0, OS_Key_Return) != 0 ||
-       os_key_press(ui_events(), ui_window(), 0, OS_Key_Space) != 0)
+    if(os_key_press(ui_events(), ui_window(), 0, OS_Key_Return) != 0)
+      // TODO(rjf): need to handle case where this would conflict with typing.
+      // if(os_key_press(ui_events(), ui_window(), 0, OS_Key_Return) != 0 ||
+      // os_key_press(ui_events(), ui_window(), 0, OS_Key_Space) != 0)
     {
       keyboard_click = 1;
       result.clicked = 1;