diff --git a/src/btstack_defines.h b/src/btstack_defines.h
index dbee1e0908..e541d38893 100644
--- a/src/btstack_defines.h
+++ b/src/btstack_defines.h
@@ -2131,7 +2131,6 @@ typedef SSIZE_T ssize_t;
 
 // Potential other meta groups
 // #define HCI_EVENT_BNEP_META                                0xxx
-// #define HCI_EVENT_GAP_META                                 0xxx
 // #define HCI_EVENT_GATT_META                                0xxx
 // #define HCI_EVENT_PAN_META                                 0xxx
 // #define HCI_EVENT_SDP_META                                 0xxx
diff --git a/src/hci.c b/src/hci.c
index 4e54631b04..abf6ba2c1d 100644
--- a/src/hci.c
+++ b/src/hci.c
@@ -6405,7 +6405,7 @@ static void hci_update_scan_enable(void){
 }
 
 void gap_discoverable_control(uint8_t enable){
-    if (enable) enable = 1; // normalize argument
+    enable = !!enable // normalize argument
     
     if (hci_stack->discoverable == enable){
         hci_emit_scan_mode_changed(hci_stack->discoverable, hci_stack->connectable);
@@ -6417,7 +6417,7 @@ void gap_discoverable_control(uint8_t enable){
 }
 
 void gap_connectable_control(uint8_t enable){
-    if (enable) enable = 1; // normalize argument
+    enable = !!enable // normalize argument
     
     // don't emit event
     if (hci_stack->connectable == enable) return;