diff --git a/bochs/gui/win32dialog.cc b/bochs/gui/win32dialog.cc
index a6ac27636..a2f569a83 100644
--- a/bochs/gui/win32dialog.cc
+++ b/bochs/gui/win32dialog.cc
@@ -311,7 +311,7 @@ void SetStandardLogOptions(HWND hDlg)
   int level, idx;
   int defchoice[5];
 
-  for (level=0; level<5; level++) {
+  for (level=0; level<N_LOGLEV; level++) {
     int mod = 0;
     int first = SIM->get_log_action (mod, level);
     BOOL consensus = true;
@@ -328,11 +328,11 @@ void SetStandardLogOptions(HWND hDlg)
     else
       defchoice[level] = 4;
   }
-  for (level=0; level<5; level++) {
+  for (level=0; level<N_LOGLEV; level++) {
     idx = 0;
     SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_RESETCONTENT, 0, 0);
     for (int action=0; action<5; action++) {
-      if (((level > 1) && (action > 0)) || ((level < 2) && ((action < 2) || (action > 3)))) {
+      if ((level > 1 && action > 0) || (level < 2 && (action < 2 || action > 3))) {
         SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_ADDSTRING, 0, (LPARAM)log_choices[action]);
         SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_SETITEMDATA, idx, action);
         if (action == defchoice[level]) {
@@ -351,11 +351,11 @@ void SetAdvancedLogOptions(HWND hDlg)
 
   idx = SendMessage(GetDlgItem(hDlg, IDDEVLIST), LB_GETCURSEL, 0, 0);
   mod = SendMessage(GetDlgItem(hDlg, IDDEVLIST), LB_GETITEMDATA, idx, 0);
-  for (level=0; level<5; level++) {
+  for (level=0; level<N_LOGLEV; level++) {
     idx = 0;
     SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_RESETCONTENT, 0, 0);
     for (int action=0; action<4; action++) {
-      if (((level > 1) && (action > 0)) || ((level < 2) && (action < 2))) {
+      if ((level > 1 && action > 0) || (level < 2 && action < 2)) {
         SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_ADDSTRING, 0, (LPARAM)log_choices[action]);
         SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_SETITEMDATA, idx, action);
         if (action == SIM->get_log_action (mod, level)) {
@@ -391,21 +391,21 @@ void ApplyLogOptions(HWND hDlg, BOOL advanced)
   if (advanced) {
     idx = SendMessage(GetDlgItem(hDlg, IDDEVLIST), LB_GETCURSEL, 0, 0);
     mod = SendMessage(GetDlgItem(hDlg, IDDEVLIST), LB_GETITEMDATA, idx, 0);
-    for (level=0; level<5; level++) {
+    for (level=0; level<N_LOGLEV; level++) {
       idx = SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_GETCURSEL, 0, 0);
       value = SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_GETITEMDATA, idx, 0);
       SIM->set_log_action (mod, level, value);
     }
     EnableWindow(GetDlgItem(hDlg, IDDEVLIST), TRUE);
   } else {
-    for (level=0; level<5; level++) {
+    for (level=0; level<N_LOGLEV; level++) {
       idx = SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_GETCURSEL, 0, 0);
       value = SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_GETITEMDATA, idx, 0);
       if (value < 4) {
         // set new default
-        SIM->set_default_log_action (level, value);
+        SIM->set_default_log_action(level, value);
         // apply that action to all modules (devices)
-        SIM->set_log_action (-1, level, value);
+        SIM->set_log_action(-1, level, value);
       }
     }
   }
diff --git a/bochs/win32res.rc b/bochs/win32res.rc
index a94adf329..f96299ca4 100644
--- a/bochs/win32res.rc
+++ b/bochs/win32res.rc
@@ -89,9 +89,6 @@ BEGIN
     LTEXT           "Panic events", IDLOGLBL4, 70, 87, 55, 14
     COMBOBOX        IDLOGEVT4, 155, 85, 65, 56, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Pass events", IDLOGLBL5, 70, 107, 55, 14
-    COMBOBOX        IDLOGEVT5, 155, 105, 65, 56, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
-                    WS_VSCROLL | WS_TABSTOP
     AUTOCHECKBOX    "Specify log options per device", IDADVLOGOPT, 50, 135, 112, 14, BS_LEFTTEXT | WS_TABSTOP
     DEFPUSHBUTTON   "OK", IDOK, 35, 155, 50, 14
     PUSHBUTTON      "Cancel", IDCANCEL, 95, 155, 50, 14