diff --git a/src/mule/mule_main.cpp b/src/mule/mule_main.cpp
index aecc5293..0e9073ac 100644
--- a/src/mule/mule_main.cpp
+++ b/src/mule/mule_main.cpp
@@ -106,7 +106,7 @@ void optimized_struct_parameters_eval_tests(void);
 #include <vector>
 #include <stdint.h>
 
-raddbg_auto_view_rule(std::vector<?>, wrap($expr._Mypair._Myval2), slice);
+raddbg_auto_view_rule(std::vector<?>, slice(_Mypair._Myval2));
 
 struct Basics{
   char a;
@@ -146,11 +146,11 @@ struct Fixed_Array{
   int count;
 };
 
-raddbg_auto_view_rule(Dynamic?, slice);
 struct Dynamic_Array{
   Pair *pairs;
   int count;
 };
+raddbg_auto_view_rule(Dynamic_Array, slice);
 
 struct Struct_With_Embedded_Arrays{
   int x;
@@ -1620,8 +1620,7 @@ struct Bitmap
   int width;
   int height;
 };
-// raddbg_auto_view_rule(Bitmap, wrap(base) bitmap(width, height));
-raddbg_auto_view_rule(Bitmap, wrap($expr.base));
+raddbg_auto_view_rule(Bitmap, bitmap(base, width, height));
 
 static unsigned int
 mule_bswap_u32(unsigned int x)