struct ec_params_lightbar {
        uint8_t cmd;                  /* Command (see enum lightbar_command) */
        union {
-               struct {
-                       /* no args */
-               } dump, off, on, init, get_seq, get_params_v0, get_params_v1,
-                       version, get_brightness, get_demo, suspend, resume;
+               /*
+                * The following commands have no args:
+                *
+                * dump, off, on, init, get_seq, get_params_v0, get_params_v1,
+                * version, get_brightness, get_demo, suspend, resume
+                *
+                * Don't use an empty struct, because C++ hates that.
+                */
 
                struct __ec_todo_unpacked {
                        uint8_t num;
                        uint8_t red, green, blue;
                } get_rgb;
 
-               struct {
-                       /* no return params */
-               } off, on, init, set_brightness, seq, reg, set_rgb,
-                       demo, set_params_v0, set_params_v1,
-                       set_program, manual_suspend_ctrl, suspend, resume;
+               /*
+                * The following commands have no response:
+                *
+                * off, on, init, set_brightness, seq, reg, set_rgb,
+                * set_params_v0, set_params_v1, set_program,
+                * manual_suspend_ctrl, suspend, resume
+                */
        };
 } __ec_todo_packed;
 
 struct ec_params_charge_state {
        uint8_t cmd;                            /* enum charge_state_command */
        union {
-               struct {
-                       /* no args */
-               } get_state;
+               /* get_state has no args */
 
                struct __ec_todo_unpacked {
                        uint32_t param;         /* enum charge_state_param */
                struct __ec_align4 {
                        uint32_t value;
                } get_param;
-               struct {
-                       /* no return values */
-               } set_param;
+
+               /* set_param returns no args */
        };
 } __ec_align4;