 {
   int item_num = 0;     // index of the menuitem to show
 
-#ifdef DEBUG
+#ifdef VFO_DEBUG
   dump_menu("menu_show, menu:", menu);
 #endif
-
-  // get rid of any stray events to this point
-  flush_events();
 
   // draw the menu page
   menu_draw(menu);
   menuitem_draw(menu, item_num);
 
+  // get rid of any stray events to this point
+  event_flush();
+
   while (true)
   {
     // handle any pending event
-    if (events_pending() > 0)
+    if (event_pending() > 0)
     {
       // get next event and handle it
-      byte event = pop_event();
+      byte event = event_pop();
       Serial.print("menu_show loop: event="); Serial.println(event2display(event));
 
       switch (event)

    // button released, check if rotation, UP event if not
    if (! re_rotation)
    {
      unsigned long push_time = millis() - re_down_time;

      if (push_time < HoldClickTime)
      {
        push_event(vfo_Click);
      }
      else
      {
        push_event(vfo_HoldClick);
      }
    }
  }

  int old_position = VfoSelectDigit;

  // handle all events in the queue
  while (event_pending() > 0)
  {
    // get next event and handle it
    VFOEvent event = event_pop();

    switch (event)
    {
