diff --git a/cell.cpp b/cell.cpp
index c11b8627..5772e2ad 100644
--- a/cell.cpp
+++ b/cell.cpp
@@ -647,7 +647,7 @@ EX debugflag debug_memory_cell = {"memory_cell"};
 
 EX void clearcell(cell *c) {
   if(!c) return;
-  indenter_finish(debug_memory_cell, hr::format("memory_cell %d %p\n", c->type, hr::voidp(c)));
+  indenter_finish iclearcell(debug_memory_cell, hr::format("memory_cell %d %p\n", c->type, hr::voidp(c)));
   for(int t=0; t<c->type; t++) if(c->move(t)) {
     if(debug_memory_cell)
       println(hlog, hr::format("mov %p [%p] S%d\n", hr::voidp(c->move(t)), hr::voidp(c->move(t)->move(c->c.spin(t))), c->c.spin(t)));
diff --git a/config.cpp b/config.cpp
index 9a24c36a..5523d582 100644
--- a/config.cpp
+++ b/config.cpp
@@ -2112,7 +2112,7 @@ EX void resetConfig() {
 EX debugflag debug_init_config = {"init_config", true};
 
 EX void saveConfig() {
-  indenter_finish(debug_init_config, "saveConfig");
+  indenter_finish isaveconfig(debug_init_config, "saveConfig");
   FILE *f = fopen(conffile.c_str(), "wt");
   if(!f) {
     addMessage(s0 + "Could not open the config file: " + conffile);
@@ -2185,7 +2185,7 @@ EX void loadNewConfig(FILE *f) {
 
 EX void loadConfig() {
  
-  indenter_finish(debug_init_config, "loadConfig");
+  indenter_finish iloadconfig(debug_init_config, "loadConfig");
   vid.xres = 9999; vid.yres = 9999; vid.framelimit = 999;
   FILE *f = fopen(conffile.c_str(), "rt");
   if(f) {
diff --git a/control.cpp b/control.cpp
index 82c01d84..63c82b22 100644
--- a/control.cpp
+++ b/control.cpp
@@ -337,7 +337,7 @@ EX debugflag debug_joy = {"joy"};
 
 EX void countJoysticks() {
   #if SDLVER == 1
-  indenter_finish(debug_init_joy, "countJoysticks");
+  indenter_finish ijoy(debug_init_joy, "countJoysticks");
   int numsticks = SDL_NumJoysticks();
   sticks.resize(numsticks);
   for(int i=0; i<numsticks; i++) {
@@ -370,7 +370,7 @@ EX void delete_joystick(int instance) {
 
 EX void initJoysticks() {
 
-  indenter_finish(debug_init_joy, "initJoysticks");
+  indenter_finish ijoy(debug_init_joy, "initJoysticks");
 
   if (SDL_error_in(SDL_InitSubSystem(SDL_INIT_JOYSTICK)))
   {
@@ -391,7 +391,7 @@ EX void initJoysticks() {
   }
 
 EX void closeJoysticks() {
-  indenter_finish(debug_init_joy, "closeJoysticks");
+  indenter_finish ijoy(debug_init_joy, "closeJoysticks");
   for(auto& s: sticks) {
     #if SDLVER >= 2
     if(s.gc) SDL_GameControllerClose(s.gc); else
@@ -419,7 +419,7 @@ EX void read_joy_axes() {
   }
 
 EX void checkjoy() {
-  indenter_finish(debug_joy, "checkjoy");
+  indenter_finish ijoy(debug_joy, "checkjoy");
   if(!DEFAULTCONTROL) return;
   ld joyvalue1 = sqr(vid.joyvalue);
   ld joyvalue2 = sqr(vid.joyvalue2);
@@ -984,7 +984,7 @@ namespace deck {
 #endif
 
 EX void mainloopiter() {
-  indenter_finish(debug_control, "mainloopiter");
+  indenter_finish imainloop(debug_control, "mainloopiter");
   GLWRAP;
 
   #if !CAP_SDLGFX && !CAP_GL 
@@ -1310,7 +1310,7 @@ EX void refresh_if_needed() {
 
 EX void handle_event(SDL_Event& ev) {
   bool normal = cmode & sm::NORMAL;
-    indenter_finish(debug_control, "got event type #" + its(ev.type));
+    indenter_finish ievent(debug_control, "got event type #" + its(ev.type));
     int sym = 0;
     int uni = 0;
     shiftmul = 1;
diff --git a/fieldpattern.cpp b/fieldpattern.cpp
index 16ac1193..7b04c585 100644
--- a/fieldpattern.cpp
+++ b/fieldpattern.cpp
@@ -609,7 +609,7 @@ EX purehookset hooks_solve3;
 
 int fpattern::solve3() {
 
-  indenter_finish(debug_field, "fpattern::solve3");
+  indenter_finish isolve3(debug_field, "fpattern::solve3");
 
   reg3::generate_fulls();
   
diff --git a/graph-player.cpp b/graph-player.cpp
index 55911e57..6b713cfd 100644
--- a/graph-player.cpp
+++ b/graph-player.cpp
@@ -760,7 +760,7 @@ debugflag debug_movestar = {"graph_movestar"};
 
 EX void drawmovestar(double dx, double dy) {
 
-  indenter_finish(debug_movestar, "drawmovestar");
+  indenter_finish imovestar(debug_movestar, "drawmovestar");
   if(viewdists) return;
   if(GDIM == 3) return;
 
diff --git a/graph.cpp b/graph.cpp
index f5f52b86..2b6a7c8c 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -288,7 +288,7 @@ EX debugflag debug_graph = {"graph"};
 EX debugflag debug_aura = {"graph_aura"};
 
 EX void drawaura() {
-  indenter_finish(debug_aura, "drawaura");
+  indenter_finish iaura(debug_aura, "drawaura");
   if(!haveaura()) return;
   if(vid.stereo_mode) return;
   double rad = current_display->radius;
@@ -1390,7 +1390,7 @@ EX void center_multiplayer_map(const vector<hyperpoint>& hs) {
 EX debugflag debug_map = {"graph_map"};
 
 EX void drawthemap() {
-  indenter_finish(debug_map, "drawthemap");
+  indenter_finish dtm(debug_map, "drawthemap");
 
   check_cgi();
   cgi.require_shapes();
@@ -1580,7 +1580,7 @@ EX debugflag debug_calcparam = {"graph_param"};
 
 EX void calcparam() {
 
-  indenter_finish(debug_calcparam, "calcparam");
+  indenter_finish icalcparam(debug_calcparam, "calcparam");
   auto cd = current_display;
   
   cd->xtop = vid.xres * cd->xmin;
@@ -1655,7 +1655,7 @@ EX function<void()> wrap_drawfullmap = drawfullmap;
 bool force_sphere_outline = false;
 
 EX void drawfullmap() {
-  indenter_finish(debug_map, "drawfullmap");
+  indenter_finish dfm(debug_map, "drawfullmap");
 
   check_cgi();
   cgi.require_shapes();
@@ -1959,7 +1959,7 @@ EX color_t titlecolor;
 
 EX void drawscreen() {
 
-  indenter_finish(debug_map, "drawscreen");
+  indenter_finish idrawscreen(debug_map, "drawscreen");
   #if CAP_GL
   GLWRAP;
   #endif
diff --git a/reg3.cpp b/reg3.cpp
index 4b4bb3ff..f355931f 100644
--- a/reg3.cpp
+++ b/reg3.cpp
@@ -1139,7 +1139,7 @@ EX namespace reg3 {
     
     
     void create_patterns() {
-      indenter_finish(debug_map_create, "creating pattern = " + its(isize(allh)));
+      indenter_finish ipatterns(debug_map_create, "creating pattern = " + its(isize(allh)));
       
       if(!PURE) {
          if(debug_errors || debug_map_create)