Register and initialize the ZCL clusters in a uniform way.

The cluster registration and initialisation is done in the functions 'proto_reg_handoff_zbee_zcl_XXX'.
In these functions the 1st step was to register the dissector.
Then the cluster was initialised via the function 'zbee_zcl_init_cluster'.

In this patch the registration and initialisation is now done by the function  'zbee_zcl_init_cluster'.
In this way we have a more uniform way of registration.

Change-Id: If865d904ea51c299a48e5c0004f3f280b7479d49
Reviewed-on: https://code.wireshark.org/review/26325
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

11 files changed, 162 insertions, 415 deletions

diff --git a/epan/dissectors/packet-zbee-zcl-closures.c b/epan/dissectors/packet-zbee-zcl-closures.c
index 702a77aa8e..f5db9e29c4 100644
--- a/epan/dissectors/packet-zbee-zcl-closures.c
+++ b/epan/dissectors/packet-zbee-zcl-closures.c
@@ -229,13 +229,8 @@ proto_register_zbee_zcl_shade_configuration(void)
 void
 proto_reg_handoff_zbee_zcl_shade_configuration(void)
 {
-    dissector_handle_t shade_config_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    shade_config_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_SHADE_CONFIG);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_SHADE_CONFIG, shade_config_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_shade_configuration,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_SHADE_CONFIG,
+                            proto_zbee_zcl_shade_configuration,
                             ett_zbee_zcl_shade_configuration,
                             ZBEE_ZCL_CID_SHADE_CONFIG,
                             hf_zbee_zcl_shade_configuration_attr_id,
@@ -569,13 +564,8 @@ proto_register_zbee_zcl_door_lock(void)
 void
 proto_reg_handoff_zbee_zcl_door_lock(void)
 {
-    dissector_handle_t door_lock_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    door_lock_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_DOOR_LOCK);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_DOOR_LOCK, door_lock_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_door_lock,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_DOOR_LOCK,
+                            proto_zbee_zcl_door_lock,
                             ett_zbee_zcl_door_lock,
                             ZBEE_ZCL_CID_DOOR_LOCK,
                             hf_zbee_zcl_door_lock_attr_id,
diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c
index 19149ca80d..0ce251cc4f 100644
--- a/epan/dissectors/packet-zbee-zcl-general.c
+++ b/epan/dissectors/packet-zbee-zcl-general.c
@@ -395,13 +395,8 @@ proto_register_zbee_zcl_basic(void)
 void
 proto_reg_handoff_zbee_zcl_basic(void)
 {
-    dissector_handle_t basic_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    basic_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_BASIC);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_BASIC, basic_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_basic,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_BASIC,
+                            proto_zbee_zcl_basic,
                             ett_zbee_zcl_basic,
                             ZBEE_ZCL_CID_BASIC,
                             hf_zbee_zcl_basic_attr_id,
@@ -870,13 +865,8 @@ proto_register_zbee_zcl_power_config(void)
 void
 proto_reg_handoff_zbee_zcl_power_config(void)
 {
-    dissector_handle_t handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    handle = find_dissector(ZBEE_PROTOABBREV_ZCL_POWER_CONFIG);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_POWER_CONFIG, handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_power_config,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_POWER_CONFIG,
+                            proto_zbee_zcl_power_config,
                             ett_zbee_zcl_power_config,
                             ZBEE_ZCL_CID_POWER_CONFIG,
                             hf_zbee_zcl_power_config_attr_id,
@@ -1101,13 +1091,8 @@ proto_register_zbee_zcl_device_temperature_configuration(void)
 void
 proto_reg_handoff_zbee_zcl_device_temperature_configuration(void)
 {
-    dissector_handle_t device_temperature_config_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    device_temperature_config_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_DEVICE_TEMP_CONFIG);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_DEVICE_TEMP_CONFIG, device_temperature_config_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_device_temperature_configuration,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_DEVICE_TEMP_CONFIG,
+                            proto_zbee_zcl_device_temperature_configuration,
                             ett_zbee_zcl_device_temperature_configuration,
                             ZBEE_ZCL_CID_DEVICE_TEMP_CONFIG,
                             hf_zbee_zcl_device_temperature_configuration_attr_id,
@@ -1483,13 +1468,8 @@ proto_register_zbee_zcl_identify(void)
 void
 proto_reg_handoff_zbee_zcl_identify(void)
 {
-    dissector_handle_t identify_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    identify_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_IDENTIFY);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_IDENTIFY, identify_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_identify,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_IDENTIFY,
+                            proto_zbee_zcl_identify,
                             ett_zbee_zcl_identify,
                             ZBEE_ZCL_CID_IDENTIFY,
                             hf_zbee_zcl_identify_attr_id,
@@ -2085,13 +2065,8 @@ proto_register_zbee_zcl_groups(void)
 void
 proto_reg_handoff_zbee_zcl_groups(void)
 {
-    dissector_handle_t groups_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    groups_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_GROUPS);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_GROUPS, groups_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_groups,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_GROUPS,
+                            proto_zbee_zcl_groups,
                             ett_zbee_zcl_groups,
                             ZBEE_ZCL_CID_GROUPS,
                             hf_zbee_zcl_groups_attr_id,
@@ -2922,13 +2897,9 @@ proto_register_zbee_zcl_scenes(void)
 void
 proto_reg_handoff_zbee_zcl_scenes(void)
 {
-    dissector_handle_t scenes_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    scenes_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_SCENES);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_SCENES, scenes_handle);
 
-    zbee_zcl_init_cluster(  proto_zbee_zcl_scenes,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_SCENES,
+                            proto_zbee_zcl_scenes,
                             ett_zbee_zcl_scenes,
                             ZBEE_ZCL_CID_SCENES,
                             hf_zbee_zcl_scenes_attr_id,
@@ -3300,13 +3271,8 @@ proto_register_zbee_zcl_on_off(void)
 void
 proto_reg_handoff_zbee_zcl_on_off(void)
 {
-    dissector_handle_t on_off_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    on_off_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_ONOFF);
-
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_ON_OFF, on_off_handle);
-    zbee_zcl_init_cluster(  proto_zbee_zcl_on_off,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_ONOFF,
+                            proto_zbee_zcl_on_off,
                             ett_zbee_zcl_on_off,
                             ZBEE_ZCL_CID_ON_OFF,
                             hf_zbee_zcl_on_off_attr_id,
@@ -3501,13 +3467,8 @@ proto_register_zbee_zcl_on_off_switch_configuration(void)
 void
 proto_reg_handoff_zbee_zcl_on_off_switch_configuration(void)
 {
-    dissector_handle_t on_off_switch_configuration_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    on_off_switch_configuration_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_ONOFF_SWITCH_CONFIG);
-
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_ON_OFF_SWITCH_CONFIG, on_off_switch_configuration_handle);
-    zbee_zcl_init_cluster(  proto_zbee_zcl_on_off_switch_configuration,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_ONOFF_SWITCH_CONFIG,
+                            proto_zbee_zcl_on_off_switch_configuration,
                             ett_zbee_zcl_on_off_switch_configuration,
                             ZBEE_ZCL_CID_ON_OFF_SWITCH_CONFIG,
                             hf_zbee_zcl_on_off_switch_configuration_attr_id,
@@ -3860,13 +3821,8 @@ proto_register_zbee_zcl_alarms(void)
 void
 proto_reg_handoff_zbee_zcl_alarms(void)
 {
-    dissector_handle_t alarms_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    alarms_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_ALARMS);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_ALARMS, alarms_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_alarms,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_ALARMS,
+                            proto_zbee_zcl_alarms,
                             ett_zbee_zcl_alarms,
                             ZBEE_ZCL_CID_ALARMS,
                             hf_zbee_zcl_alarms_attr_id,
@@ -4098,13 +4054,8 @@ proto_register_zbee_zcl_time(void)
 void
 proto_reg_handoff_zbee_zcl_time(void)
 {
-    dissector_handle_t time_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    time_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_TIME);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_TIME, time_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_time,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_TIME,
+                            proto_zbee_zcl_time,
                             ett_zbee_zcl_time,
                             ZBEE_ZCL_CID_TIME,
                             hf_zbee_zcl_time_attr_id,
@@ -4511,13 +4462,8 @@ proto_register_zbee_zcl_level_control(void)
 void
 proto_reg_handoff_zbee_zcl_level_control(void)
 {
-    dissector_handle_t level_control_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    level_control_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_LEVEL_CONTROL);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_LEVEL_CONTROL, level_control_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_level_control,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_LEVEL_CONTROL,
+                            proto_zbee_zcl_level_control,
                             ett_zbee_zcl_level_control,
                             ZBEE_ZCL_CID_LEVEL_CONTROL,
                             hf_zbee_zcl_level_control_attr_id,
@@ -5720,13 +5666,8 @@ proto_register_zbee_zcl_rssi_location(void)
 void
 proto_reg_handoff_zbee_zcl_rssi_location(void)
 {
-    dissector_handle_t rssi_location_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    rssi_location_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_RSSI_LOCATION);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_RSSI_LOCATION, rssi_location_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_rssi_location,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_RSSI_LOCATION,
+                            proto_zbee_zcl_rssi_location,
                             ett_zbee_zcl_rssi_location,
                             ZBEE_ZCL_CID_RSSI_LOCATION,
                             hf_zbee_zcl_rssi_location_attr_id,
@@ -6010,13 +5951,8 @@ proto_register_zbee_zcl_analog_input_basic(void)
 void
 proto_reg_handoff_zbee_zcl_analog_input_basic(void)
 {
-    dissector_handle_t analog_input_basic_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    analog_input_basic_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_ANALOG_INPUT_BASIC);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_ANALOG_INPUT_BASIC, analog_input_basic_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_analog_input_basic,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_ANALOG_INPUT_BASIC,
+                            proto_zbee_zcl_analog_input_basic,
                             ett_zbee_zcl_analog_input_basic,
                             ZBEE_ZCL_CID_ANALOG_INPUT_BASIC,
                             hf_zbee_zcl_analog_input_basic_attr_id,
@@ -6304,13 +6240,8 @@ proto_register_zbee_zcl_analog_output_basic(void)
 void
 proto_reg_handoff_zbee_zcl_analog_output_basic(void)
 {
-    dissector_handle_t analog_output_basic_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    analog_output_basic_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_ANALOG_OUTPUT_BASIC);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_ANALOG_OUTPUT_BASIC, analog_output_basic_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_analog_output_basic,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_ANALOG_OUTPUT_BASIC,
+                            proto_zbee_zcl_analog_output_basic,
                             ett_zbee_zcl_analog_output_basic,
                             ZBEE_ZCL_CID_ANALOG_OUTPUT_BASIC,
                             hf_zbee_zcl_analog_output_basic_attr_id,
@@ -6587,13 +6518,8 @@ proto_register_zbee_zcl_analog_value_basic(void)
 void
 proto_reg_handoff_zbee_zcl_analog_value_basic(void)
 {
-    dissector_handle_t analog_value_basic_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    analog_value_basic_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_ANALOG_VALUE_BASIC);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_ANALOG_VALUE_BASIC, analog_value_basic_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_analog_value_basic,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_ANALOG_VALUE_BASIC,
+                            proto_zbee_zcl_analog_value_basic,
                             ett_zbee_zcl_analog_value_basic,
                             ZBEE_ZCL_CID_ANALOG_VALUE_BASIC,
                             hf_zbee_zcl_analog_value_basic_attr_id,
@@ -6843,13 +6769,8 @@ proto_register_zbee_zcl_binary_input_basic(void)
 void
 proto_reg_handoff_zbee_zcl_binary_input_basic(void)
 {
-    dissector_handle_t binary_input_basic_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    binary_input_basic_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_BINARY_INPUT_BASIC);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_BINARY_INPUT_BASIC, binary_input_basic_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_binary_input_basic,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_BINARY_INPUT_BASIC,
+                            proto_zbee_zcl_binary_input_basic,
                             ett_zbee_zcl_binary_input_basic,
                             ZBEE_ZCL_CID_BINARY_INPUT_BASIC,
                             hf_zbee_zcl_binary_input_basic_attr_id,
@@ -7152,13 +7073,8 @@ proto_register_zbee_zcl_binary_output_basic(void)
 void
 proto_reg_handoff_zbee_zcl_binary_output_basic(void)
 {
-    dissector_handle_t binary_output_basic_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    binary_output_basic_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_BINARY_OUTPUT_BASIC);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_BINARY_OUTPUT_BASIC, binary_output_basic_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_binary_output_basic,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_BINARY_OUTPUT_BASIC,
+                            proto_zbee_zcl_binary_output_basic,
                             ett_zbee_zcl_binary_output_basic,
                             ZBEE_ZCL_CID_BINARY_OUTPUT_BASIC,
                             hf_zbee_zcl_binary_output_basic_attr_id,
@@ -7443,13 +7359,8 @@ proto_register_zbee_zcl_binary_value_basic(void)
 void
 proto_reg_handoff_zbee_zcl_binary_value_basic(void)
 {
-    dissector_handle_t binary_value_basic_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    binary_value_basic_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_BINARY_VALUE_BASIC);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_BINARY_VALUE_BASIC, binary_value_basic_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_binary_value_basic,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_BINARY_VALUE_BASIC,
+                            proto_zbee_zcl_binary_value_basic,
                             ett_zbee_zcl_binary_value_basic,
                             ZBEE_ZCL_CID_BINARY_VALUE_BASIC,
                             hf_zbee_zcl_binary_value_basic_attr_id,
@@ -7681,13 +7592,8 @@ proto_register_zbee_zcl_multistate_input_basic(void)
 void
 proto_reg_handoff_zbee_zcl_multistate_input_basic(void)
 {
-    dissector_handle_t multistate_input_basic_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    multistate_input_basic_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_MULTISTATE_INPUT_BASIC);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_MULTISTATE_INPUT_BASIC, multistate_input_basic_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_multistate_input_basic,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_MULTISTATE_INPUT_BASIC,
+                            proto_zbee_zcl_multistate_input_basic,
                             ett_zbee_zcl_multistate_input_basic,
                             ZBEE_ZCL_CID_MULTISTATE_INPUT_BASIC,
                             hf_zbee_zcl_multistate_input_basic_attr_id,
@@ -7974,13 +7880,8 @@ proto_register_zbee_zcl_multistate_output_basic(void)
 void
 proto_reg_handoff_zbee_zcl_multistate_output_basic(void)
 {
-    dissector_handle_t multistate_output_basic_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    multistate_output_basic_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_MULTISTATE_OUTPUT_BASIC);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_MULTISTATE_OUTPUT_BASIC, multistate_output_basic_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_multistate_output_basic,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_MULTISTATE_OUTPUT_BASIC,
+                            proto_zbee_zcl_multistate_output_basic,
                             ett_zbee_zcl_multistate_output_basic,
                             ZBEE_ZCL_CID_MULTISTATE_OUTPUT_BASIC,
                             hf_zbee_zcl_multistate_output_basic_attr_id,
@@ -8268,13 +8169,8 @@ proto_register_zbee_zcl_multistate_value_basic(void)
 void
 proto_reg_handoff_zbee_zcl_multistate_value_basic(void)
 {
-    dissector_handle_t multistate_value_basic_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    multistate_value_basic_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_MULTISTATE_VALUE_BASIC);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_MULTISTATE_VALUE_BASIC, multistate_value_basic_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_multistate_value_basic,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_MULTISTATE_VALUE_BASIC,
+                            proto_zbee_zcl_multistate_value_basic,
                             ett_zbee_zcl_multistate_value_basic,
                             ZBEE_ZCL_CID_MULTISTATE_VALUE_BASIC,
                             hf_zbee_zcl_multistate_value_basic_attr_id,
@@ -8871,13 +8767,8 @@ proto_register_zbee_zcl_commissioning(void)
 void
 proto_reg_handoff_zbee_zcl_commissioning(void)
 {
-    dissector_handle_t commissioning_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    commissioning_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_COMMISSIONING);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_COMMISSIONING, commissioning_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_commissioning,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_COMMISSIONING,
+                            proto_zbee_zcl_commissioning,
                             ett_zbee_zcl_commissioning,
                             ZBEE_ZCL_CID_COMMISSIONING,
                             hf_zbee_zcl_commissioning_attr_id,
@@ -9440,13 +9331,8 @@ void proto_register_zbee_zcl_part(void)
  */
 void proto_reg_handoff_zbee_zcl_part(void)
 {
-    dissector_handle_t part_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    part_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_PART);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_PARTITION, part_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_part,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_PART,
+                            proto_zbee_zcl_part,
                             ett_zbee_zcl_part,
                             ZBEE_ZCL_CID_PARTITION,
                             hf_zbee_zcl_part_attr_id,
@@ -10636,13 +10522,8 @@ void proto_register_zbee_zcl_ota(void)
  */
 void proto_reg_handoff_zbee_zcl_ota(void)
 {
-    dissector_handle_t ota_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    ota_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_OTA);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_OTA_UPGRADE, ota_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_ota,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_OTA,
+                            proto_zbee_zcl_ota,
                             ett_zbee_zcl_ota,
                             ZBEE_ZCL_CID_OTA_UPGRADE,
                             hf_zbee_zcl_ota_attr_id,
@@ -11779,13 +11660,8 @@ proto_register_zbee_zcl_pwr_prof(void)
 void
 proto_reg_handoff_zbee_zcl_pwr_prof(void)
 {
-    dissector_handle_t pwr_prof_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    pwr_prof_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_PWRPROF);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_POWER_PROFILE, pwr_prof_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_pwr_prof,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_PWRPROF,
+                            proto_zbee_zcl_pwr_prof,
                             ett_zbee_zcl_pwr_prof,
                             ZBEE_ZCL_CID_POWER_PROFILE,
                             hf_zbee_zcl_pwr_prof_attr_id,
@@ -12454,13 +12330,8 @@ proto_register_zbee_zcl_appl_ctrl(void)
 void
 proto_reg_handoff_zbee_zcl_appl_ctrl(void)
 {
-    dissector_handle_t appl_ctrl_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    appl_ctrl_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_APPLCTRL);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_APPLIANCE_CONTROL, appl_ctrl_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_appl_ctrl,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_APPLCTRL,
+                            proto_zbee_zcl_appl_ctrl,
                             ett_zbee_zcl_appl_ctrl,
                             ZBEE_ZCL_CID_APPLIANCE_CONTROL,
                             hf_zbee_zcl_appl_ctrl_attr_id,
@@ -12723,13 +12594,8 @@ proto_register_zbee_zcl_poll_ctrl(void)
 void
 proto_reg_handoff_zbee_zcl_poll_ctrl(void)
 {
-    dissector_handle_t poll_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    poll_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_POLL);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_POLL_CONTROL, poll_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_poll_ctrl,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_POLL,
+                            proto_zbee_zcl_poll_ctrl,
                             ett_zbee_zcl_poll_ctrl,
                             ZBEE_ZCL_CID_POLL_CONTROL,
                             hf_zbee_zcl_poll_ctrl_attr_id,
@@ -15480,14 +15346,10 @@ proto_register_zbee_zcl_gp(void)
 void
 proto_reg_handoff_zbee_zcl_gp(void)
 {
-    dissector_handle_t handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    handle = find_dissector(ZBEE_PROTOABBREV_ZCL_GP);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_GP, handle);
     zgp_handle = find_dissector(ZBEE_PROTOABBREV_NWK_GP_CMD);
 
-    zbee_zcl_init_cluster(  proto_zbee_zcl_gp,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_GP,
+                            proto_zbee_zcl_gp,
                             ett_zbee_zcl_gp,
                             ZBEE_ZCL_CID_GP,
                             hf_zbee_zcl_gp_attr_id,
@@ -16294,13 +16156,8 @@ proto_register_zbee_zcl_touchlink(void)
 void
 proto_reg_handoff_zbee_zcl_touchlink(void)
 {
-    dissector_handle_t touchlink_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    touchlink_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_TOUCHLINK);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_ZLL, touchlink_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_touchlink,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_TOUCHLINK,
+                            proto_zbee_zcl_touchlink,
                             ett_zbee_zcl_touchlink,
                             ZBEE_ZCL_CID_ZLL,
                             -1,
diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c
index 77cb2a91b7..22ffe30044 100644
--- a/epan/dissectors/packet-zbee-zcl-ha.c
+++ b/epan/dissectors/packet-zbee-zcl-ha.c
@@ -332,7 +332,8 @@ proto_register_zbee_zcl_appl_idt(void)
 void
 proto_reg_handoff_zbee_zcl_appl_idt(void)
 {
-    zbee_zcl_init_cluster(  proto_zbee_zcl_appl_idt,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_APPLIDT,
+                            proto_zbee_zcl_appl_idt,
                             ett_zbee_zcl_appl_idt,
                             ZBEE_ZCL_CID_APPLIANCE_IDENTIFICATION,
                             hf_zbee_zcl_appl_idt_attr_id,
@@ -535,7 +536,8 @@ proto_register_zbee_zcl_met_idt(void)
 void
 proto_reg_handoff_zbee_zcl_met_idt(void)
 {
-    zbee_zcl_init_cluster(  proto_zbee_zcl_met_idt,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_METIDT,
+                            proto_zbee_zcl_met_idt,
                             ett_zbee_zcl_met_idt,
                             ZBEE_ZCL_CID_METER_IDENTIFICATION,
                             hf_zbee_zcl_met_idt_attr_id,
@@ -908,13 +910,8 @@ proto_register_zbee_zcl_appl_evtalt(void)
 void
 proto_reg_handoff_zbee_zcl_appl_evtalt(void)
 {
-    dissector_handle_t appl_evtalt_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    appl_evtalt_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_APPLEVTALT);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_APPLIANCE_EVENTS_AND_ALERT, appl_evtalt_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_appl_evtalt,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_APPLEVTALT,
+                            proto_zbee_zcl_appl_evtalt,
                             ett_zbee_zcl_appl_evtalt,
                             ZBEE_ZCL_CID_APPLIANCE_EVENTS_AND_ALERT,
                             -1,
@@ -1266,13 +1263,8 @@ proto_register_zbee_zcl_appl_stats(void)
 void
 proto_reg_handoff_zbee_zcl_appl_stats(void)
 {
-    dissector_handle_t appl_stats_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    appl_stats_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_APPLSTATS);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_APPLIANCE_STATISTICS, appl_stats_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_appl_stats,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_APPLSTATS,
+                            proto_zbee_zcl_appl_stats,
                             ett_zbee_zcl_appl_stats,
                             ZBEE_ZCL_CID_APPLIANCE_STATISTICS,
                             hf_zbee_zcl_appl_stats_attr_id,
diff --git a/epan/dissectors/packet-zbee-zcl-hvac.c b/epan/dissectors/packet-zbee-zcl-hvac.c
index ae0a116d83..3f2716150a 100644
--- a/epan/dissectors/packet-zbee-zcl-hvac.c
+++ b/epan/dissectors/packet-zbee-zcl-hvac.c
@@ -470,13 +470,8 @@ proto_register_zbee_zcl_pump_config_control(void)
 void
 proto_reg_handoff_zbee_zcl_pump_config_control(void)
 {
-    dissector_handle_t pump_config_ctrl_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    pump_config_ctrl_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_PUMP_CONFIG_CTRL);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_PUMP_CONFIG_CONTROL, pump_config_ctrl_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_pump_config_control,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_PUMP_CONFIG_CTRL,
+                            proto_zbee_zcl_pump_config_control,
                             ett_zbee_zcl_pump_config_control,
                             ZBEE_ZCL_CID_PUMP_CONFIG_CONTROL,
                             hf_zbee_zcl_pump_config_control_attr_id,
@@ -654,13 +649,8 @@ proto_register_zbee_zcl_fan_control(void)
 void
 proto_reg_handoff_zbee_zcl_fan_control(void)
 {
-    dissector_handle_t fan_control_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    fan_control_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_FAN_CONTROL);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_FAN_CONTROL, fan_control_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_fan_control,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_FAN_CONTROL,
+                            proto_zbee_zcl_fan_control,
                             ett_zbee_zcl_fan_control,
                             ZBEE_ZCL_CID_FAN_CONTROL,
                             hf_zbee_zcl_fan_control_attr_id,
@@ -864,13 +854,8 @@ proto_register_zbee_zcl_dehumidification_control(void)
 void
 proto_reg_handoff_zbee_zcl_dehumidification_control(void)
 {
-    dissector_handle_t dehumidification_control_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    dehumidification_control_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_DEHUMIDIFICATION_CONTROL);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_DEHUMIDIFICATION_CONTROL, dehumidification_control_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_dehumidification_control,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_DEHUMIDIFICATION_CONTROL,
+                            proto_zbee_zcl_dehumidification_control,
                             ett_zbee_zcl_dehumidification_control,
                             ZBEE_ZCL_CID_DEHUMIDIFICATION_CONTROL,
                             hf_zbee_zcl_dehumidification_control_attr_id,
@@ -1043,13 +1028,8 @@ proto_register_zbee_zcl_thermostat_ui_config(void)
 void
 proto_reg_handoff_zbee_zcl_thermostat_ui_config(void)
 {
-    dissector_handle_t thermostat_ui_config_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    thermostat_ui_config_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_THERMOSTAT_UI_CONFIG);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_THERMOSTAT_UI_CONFIG, thermostat_ui_config_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_thermostat_ui_config,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_THERMOSTAT_UI_CONFIG,
+                            proto_zbee_zcl_thermostat_ui_config,
                             ett_zbee_zcl_thermostat_ui_config,
                             ZBEE_ZCL_CID_THERMOSTAT_UI_CONFIG,
                             hf_zbee_zcl_thermostat_ui_config_attr_id,
diff --git a/epan/dissectors/packet-zbee-zcl-lighting.c b/epan/dissectors/packet-zbee-zcl-lighting.c
index c1f5b91c55..28ecde1690 100644
--- a/epan/dissectors/packet-zbee-zcl-lighting.c
+++ b/epan/dissectors/packet-zbee-zcl-lighting.c
@@ -734,13 +734,8 @@ proto_register_zbee_zcl_color_control(void)
 void
 proto_reg_handoff_zbee_zcl_color_control(void)
 {
-    dissector_handle_t color_control_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    color_control_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_COLOR_CONTROL);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_COLOR_CONTROL, color_control_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_color_control,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_COLOR_CONTROL,
+                            proto_zbee_zcl_color_control,
                             ett_zbee_zcl_color_control,
                             ZBEE_ZCL_CID_COLOR_CONTROL,
                             hf_zbee_zcl_color_control_attr_id,
@@ -995,13 +990,8 @@ proto_register_zbee_zcl_ballast_configuration(void)
 void
 proto_reg_handoff_zbee_zcl_ballast_configuration(void)
 {
-    dissector_handle_t ballast_config_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    ballast_config_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_BALLAST_CONFIG);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_BALLAST_CONFIG, ballast_config_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_ballast_configuration,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_BALLAST_CONFIG,
+                            proto_zbee_zcl_ballast_configuration,
                             ett_zbee_zcl_ballast_configuration,
                             ZBEE_ZCL_CID_BALLAST_CONFIG,
                             hf_zbee_zcl_ballast_configuration_attr_id,
diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
index cc87dcaa68..100807bdbd 100644
--- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c
+++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
@@ -298,7 +298,8 @@ proto_register_zbee_zcl_illum_meas(void)
 void
 proto_reg_handoff_zbee_zcl_illum_meas(void)
 {
-    zbee_zcl_init_cluster(  proto_zbee_zcl_illum_meas,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_ILLUMMEAS,
+                            proto_zbee_zcl_illum_meas,
                             ett_zbee_zcl_illum_meas,
                             ZBEE_ZCL_CID_ILLUMINANCE_MEASUREMENT,
                             hf_zbee_zcl_illum_meas_attr_id,
@@ -503,7 +504,8 @@ proto_register_zbee_zcl_illum_level_sen(void)
 void
 proto_reg_handoff_zbee_zcl_illum_level_sen(void)
 {
-    zbee_zcl_init_cluster(  proto_zbee_zcl_illum_level_sen,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_ILLUMLEVELSEN,
+                            proto_zbee_zcl_illum_level_sen,
                             ett_zbee_zcl_illum_level_sen,
                             ZBEE_ZCL_CID_ILLUMINANCE_LEVEL_SENSING,
                             hf_zbee_zcl_illum_level_sen_attr_id,
@@ -761,7 +763,8 @@ proto_register_zbee_zcl_temp_meas(void)
 void
 proto_reg_handoff_zbee_zcl_temp_meas(void)
 {
-    zbee_zcl_init_cluster(  proto_zbee_zcl_temp_meas,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_TEMPMEAS,
+                            proto_zbee_zcl_temp_meas,
                             ett_zbee_zcl_temp_meas,
                             ZBEE_ZCL_CID_TEMPERATURE_MEASUREMENT,
                             hf_zbee_zcl_temp_meas_attr_id,
@@ -1081,7 +1084,8 @@ proto_register_zbee_zcl_press_meas(void)
 void
 proto_reg_handoff_zbee_zcl_press_meas(void)
 {
-    zbee_zcl_init_cluster(  proto_zbee_zcl_press_meas,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_PRESSMEAS,
+                            proto_zbee_zcl_press_meas,
                             ett_zbee_zcl_press_meas,
                             ZBEE_ZCL_CID_PRESSURE_MEASUREMENT,
                             hf_zbee_zcl_press_meas_attr_id,
@@ -1342,7 +1346,8 @@ proto_register_zbee_zcl_flow_meas(void)
 void
 proto_reg_handoff_zbee_zcl_flow_meas(void)
 {
-    zbee_zcl_init_cluster(  proto_zbee_zcl_flow_meas,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_FLOWMEAS,
+                            proto_zbee_zcl_flow_meas,
                             ett_zbee_zcl_flow_meas,
                             ZBEE_ZCL_CID_FLOW_MEASUREMENT,
                             hf_zbee_zcl_flow_meas_attr_id,
@@ -1598,7 +1603,8 @@ proto_register_zbee_zcl_relhum_meas(void)
 void
 proto_reg_handoff_zbee_zcl_relhum_meas(void)
 {
-    zbee_zcl_init_cluster(  proto_zbee_zcl_relhum_meas,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_RELHUMMEAS,
+                            proto_zbee_zcl_relhum_meas,
                             ett_zbee_zcl_relhum_meas,
                             ZBEE_ZCL_CID_REL_HUMIDITY_MEASUREMENT,
                             hf_zbee_zcl_relhum_meas_attr_id,
@@ -1797,9 +1803,10 @@ proto_register_zbee_zcl_occ_sen(void)
 void
 proto_reg_handoff_zbee_zcl_occ_sen(void)
 {
-    zbee_zcl_init_cluster(  proto_zbee_zcl_occ_sen,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_OCCSEN,
+                            proto_zbee_zcl_occ_sen,
                             ett_zbee_zcl_occ_sen,
-                            ZBEE_ZCL_CID_ILLUMINANCE_LEVEL_SENSING,
+                            ZBEE_ZCL_CID_OCCUPANCY_SENSING,
                             hf_zbee_zcl_occ_sen_attr_id,
                             -1, -1,
                             (zbee_zcl_fn_attr_data)dissect_zcl_occ_sen_attr_data
diff --git a/epan/dissectors/packet-zbee-zcl-misc.c b/epan/dissectors/packet-zbee-zcl-misc.c
index 13907105a5..2e277f130f 100644
--- a/epan/dissectors/packet-zbee-zcl-misc.c
+++ b/epan/dissectors/packet-zbee-zcl-misc.c
@@ -565,13 +565,8 @@ proto_register_zbee_zcl_thermostat(void)
 void
 proto_reg_handoff_zbee_zcl_thermostat(void)
 {
-    dissector_handle_t thermostat_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    thermostat_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_THERMOSTAT);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_THERMOSTAT, thermostat_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_thermostat,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_THERMOSTAT,
+                            proto_zbee_zcl_thermostat,
                             ett_zbee_zcl_thermostat,
                             ZBEE_ZCL_CID_THERMOSTAT,
                             hf_zbee_zcl_thermostat_attr_id,
@@ -909,13 +904,8 @@ dissect_zcl_ias_zone_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, g
 void
 proto_reg_handoff_zbee_zcl_ias_zone(void)
 {
-    dissector_handle_t zone_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    zone_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_IAS_ZONE);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_IAS_ZONE, zone_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_ias_zone,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_IAS_ZONE,
+                            proto_zbee_zcl_ias_zone,
                             ett_zbee_zcl_ias_zone,
                             ZBEE_ZCL_CID_IAS_ZONE,
                             hf_zbee_zcl_ias_zone_attr_id,
diff --git a/epan/dissectors/packet-zbee-zcl-sas.c b/epan/dissectors/packet-zbee-zcl-sas.c
index 10f6533aa2..d195caa0b3 100644
--- a/epan/dissectors/packet-zbee-zcl-sas.c
+++ b/epan/dissectors/packet-zbee-zcl-sas.c
@@ -427,13 +427,8 @@ proto_register_zbee_zcl_ias_ace(void)
 void
 proto_reg_handoff_zbee_zcl_ias_ace(void)
 {
-    dissector_handle_t ias_ace_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    ias_ace_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_IAS_ACE);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_IAS_ACE, ias_ace_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_ias_ace,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_IAS_ACE,
+                            proto_zbee_zcl_ias_ace,
                             ett_zbee_zcl_ias_ace,
                             ZBEE_ZCL_CID_IAS_ACE,
                             -1,
@@ -746,13 +741,8 @@ proto_register_zbee_zcl_ias_wd(void)
 void
 proto_reg_handoff_zbee_zcl_ias_wd(void)
 {
-    dissector_handle_t ias_wd_handle;
-
-    /* Register our dissector with the ZigBee application dissectors. */
-    ias_wd_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_IAS_WD);
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_IAS_WD, ias_wd_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_ias_wd,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_IAS_WD,
+                            proto_zbee_zcl_ias_wd,
                             ett_zbee_zcl_ias_wd,
                             ZBEE_ZCL_CID_IAS_WD,
                             hf_zbee_zcl_ias_wd_attr_id,
diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c
index f9aa139fbc..a0f3eacd7d 100644
--- a/epan/dissectors/packet-zbee-zcl-se.c
+++ b/epan/dissectors/packet-zbee-zcl-se.c
@@ -110,8 +110,6 @@ static void dissect_zcl_keep_alive_attr_data(proto_tree *tree, tvbuff_t *tvb, gu
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t keep_alive_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_keep_alive = -1;
 
@@ -214,7 +212,7 @@ proto_register_zbee_zcl_keep_alive(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Keep-Alive dissector. */
-    keep_alive_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_KEEP_ALIVE, dissect_zbee_zcl_keep_alive, proto_zbee_zcl_keep_alive);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_KEEP_ALIVE, dissect_zbee_zcl_keep_alive, proto_zbee_zcl_keep_alive);
 } /*proto_register_zbee_zcl_keep_alive*/
 
 /**
@@ -224,10 +222,8 @@ proto_register_zbee_zcl_keep_alive(void)
 void
 proto_reg_handoff_zbee_zcl_keep_alive(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_KEEP_ALIVE, keep_alive_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_keep_alive,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_KEEP_ALIVE,
+                            proto_zbee_zcl_keep_alive,
                             ett_zbee_zcl_keep_alive,
                             ZBEE_ZCL_CID_KEEP_ALIVE,
                             hf_zbee_zcl_keep_alive_attr_id,
@@ -1417,8 +1413,6 @@ static void dissect_zcl_price_publish_cancel_tariff          (tvbuff_t *tvb, pro
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t price_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_price = -1;
 
@@ -3537,7 +3531,7 @@ proto_register_zbee_zcl_price(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Price dissector. */
-    price_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_PRICE, dissect_zbee_zcl_price, proto_zbee_zcl_price);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_PRICE, dissect_zbee_zcl_price, proto_zbee_zcl_price);
 } /*proto_register_zbee_zcl_price*/
 
 /**
@@ -3547,10 +3541,8 @@ proto_register_zbee_zcl_price(void)
 void
 proto_reg_handoff_zbee_zcl_price(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_PRICE, price_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_price,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_PRICE,
+                            proto_zbee_zcl_price,
                             ett_zbee_zcl_price,
                             ZBEE_ZCL_CID_PRICE,
                             hf_zbee_zcl_price_attr_id,
@@ -3607,8 +3599,6 @@ static void dissect_zcl_drlc_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *o
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t drlc_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_drlc = -1;
 
@@ -3777,7 +3767,7 @@ proto_register_zbee_zcl_drlc(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL DRLC dissector. */
-    drlc_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_DRLC, dissect_zbee_zcl_drlc, proto_zbee_zcl_drlc);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_DRLC, dissect_zbee_zcl_drlc, proto_zbee_zcl_drlc);
 } /*proto_register_zbee_zcl_drlc*/
 
 /**
@@ -3787,10 +3777,8 @@ proto_register_zbee_zcl_drlc(void)
 void
 proto_reg_handoff_zbee_zcl_drlc(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_DEMAND_RESPONSE_LOAD_CONTROL, drlc_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_drlc,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_DRLC,
+                            proto_zbee_zcl_drlc,
                             ett_zbee_zcl_drlc,
                             ZBEE_ZCL_CID_DEMAND_RESPONSE_LOAD_CONTROL,
                             hf_zbee_zcl_drlc_attr_id,
@@ -4828,8 +4816,6 @@ static void dissect_zcl_met_get_notified_msg        (tvbuff_t *tvb, proto_tree *
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t met_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_met = -1;
 
@@ -5927,7 +5913,7 @@ proto_register_zbee_zcl_met(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Metering dissector. */
-    met_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_MET, dissect_zbee_zcl_met, proto_zbee_zcl_met);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_MET, dissect_zbee_zcl_met, proto_zbee_zcl_met);
 } /*proto_register_zbee_zcl_met*/
 
 /**
@@ -5937,10 +5923,8 @@ proto_register_zbee_zcl_met(void)
 void
 proto_reg_handoff_zbee_zcl_met(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_SIMPLE_METERING, met_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_met,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_MET,
+                            proto_zbee_zcl_met,
                             ett_zbee_zcl_met,
                             ZBEE_ZCL_CID_SIMPLE_METERING,
                             hf_zbee_zcl_met_attr_id,
@@ -6026,8 +6010,6 @@ static void decode_zcl_msg_duration             (gchar *s, guint16 value);
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t msg_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_msg = -1;
 
@@ -6546,7 +6528,7 @@ proto_register_zbee_zcl_msg(void)
     expert_register_field_array(expert_zbee_zcl_msg, ei, array_length(ei));
 
     /* Register the ZigBee ZCL Messaging dissector. */
-    msg_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_MSG, dissect_zbee_zcl_msg, proto_zbee_zcl_msg);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_MSG, dissect_zbee_zcl_msg, proto_zbee_zcl_msg);
 } /*proto_register_zbee_zcl_msg*/
 
 /**
@@ -6556,10 +6538,8 @@ proto_register_zbee_zcl_msg(void)
 void
 proto_reg_handoff_zbee_zcl_msg(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_MESSAGE, msg_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_msg,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_MSG,
+                            proto_zbee_zcl_msg,
                             ett_zbee_zcl_msg,
                             ZBEE_ZCL_CID_MESSAGE,
                             hf_zbee_zcl_msg_attr_id,
@@ -6623,8 +6603,6 @@ static void dissect_zcl_tun_attr_data  (proto_tree *tree, tvbuff_t *tvb, guint *
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t tun_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_tun = -1;
 
@@ -7136,7 +7114,7 @@ proto_register_zbee_zcl_tun(void)
     zbee_zcl_tun_heur_subdissector_list = register_heur_dissector_list(ZBEE_PROTOABBREV_ZCL_TUN, proto_zbee_zcl_tun);
 
     /* Register the ZigBee ZCL Tunneling dissector. */
-    tun_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_TUN, dissect_zbee_zcl_tun, proto_zbee_zcl_tun);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_TUN, dissect_zbee_zcl_tun, proto_zbee_zcl_tun);
 
 } /* proto_register_zbee_zcl_tun */
 
@@ -7147,10 +7125,8 @@ proto_register_zbee_zcl_tun(void)
 void
 proto_reg_handoff_zbee_zcl_tun(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_TUNNELING, tun_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_tun,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_TUN,
+                            proto_zbee_zcl_tun,
                             ett_zbee_zcl_tun,
                             ZBEE_ZCL_CID_TUNNELING,
                             hf_zbee_zcl_tun_attr_id,
@@ -7371,8 +7347,6 @@ static void dissect_zcl_pp_publish_debt_log                     (tvbuff_t *tvb,
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t pp_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_pp = -1;
 
@@ -8538,7 +8512,7 @@ proto_register_zbee_zcl_pp(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Prepayment dissector. */
-    pp_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_PRE_PAYMENT, dissect_zbee_zcl_pp, proto_zbee_zcl_pp);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_PRE_PAYMENT, dissect_zbee_zcl_pp, proto_zbee_zcl_pp);
 } /*proto_register_zbee_zcl_pp*/
 
 /**
@@ -8548,10 +8522,8 @@ proto_register_zbee_zcl_pp(void)
 void
 proto_reg_handoff_zbee_zcl_pp(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_PRE_PAYMENT, pp_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_pp,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_PRE_PAYMENT,
+                            proto_zbee_zcl_pp,
                             ett_zbee_zcl_pp,
                             ZBEE_ZCL_CID_PRE_PAYMENT,
                             hf_zbee_zcl_pp_attr_id,
@@ -8608,8 +8580,6 @@ static void dissect_zcl_energy_management_attr_data(proto_tree *tree, tvbuff_t *
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t energy_management_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_energy_management = -1;
 
@@ -8766,7 +8736,7 @@ proto_register_zbee_zcl_energy_management(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Energy Management dissector. */
-    energy_management_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_ENERGY_MANAGEMENT, dissect_zbee_zcl_energy_management, proto_zbee_zcl_energy_management);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_ENERGY_MANAGEMENT, dissect_zbee_zcl_energy_management, proto_zbee_zcl_energy_management);
 } /*proto_register_zbee_zcl_energy_management*/
 
 /**
@@ -8776,10 +8746,8 @@ proto_register_zbee_zcl_energy_management(void)
 void
 proto_reg_handoff_zbee_zcl_energy_management(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_ENERGY_MANAGEMENT, energy_management_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_energy_management,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_ENERGY_MANAGEMENT,
+                            proto_zbee_zcl_energy_management,
                             ett_zbee_zcl_energy_management,
                             ZBEE_ZCL_CID_ENERGY_MANAGEMENT,
                             hf_zbee_zcl_energy_management_attr_id,
@@ -8861,8 +8829,6 @@ static void dissect_zcl_calendar_cancel(tvbuff_t *tvb, proto_tree *tree, guint *
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t calendar_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_calendar = -1;
 
@@ -9741,7 +9707,7 @@ proto_register_zbee_zcl_calendar(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Calendar dissector. */
-    calendar_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_CALENDAR, dissect_zbee_zcl_calendar, proto_zbee_zcl_calendar);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_CALENDAR, dissect_zbee_zcl_calendar, proto_zbee_zcl_calendar);
 } /*proto_register_zbee_zcl_calendar*/
 
 /**
@@ -9751,10 +9717,8 @@ proto_register_zbee_zcl_calendar(void)
 void
 proto_reg_handoff_zbee_zcl_calendar(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_CALENDAR, calendar_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_calendar,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_CALENDAR,
+                            proto_zbee_zcl_calendar,
                             ett_zbee_zcl_calendar,
                             ZBEE_ZCL_CID_CALENDAR,
                             hf_zbee_zcl_calendar_attr_id,
@@ -9840,8 +9804,6 @@ static void dissect_zcl_device_management_attr_data(proto_tree *tree, tvbuff_t *
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t device_management_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_device_management = -1;
 
@@ -10040,7 +10002,7 @@ proto_register_zbee_zcl_device_management(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Device Management dissector. */
-    device_management_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_DEVICE_MANAGEMENT, dissect_zbee_zcl_device_management, proto_zbee_zcl_device_management);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_DEVICE_MANAGEMENT, dissect_zbee_zcl_device_management, proto_zbee_zcl_device_management);
 } /*proto_register_zbee_zcl_device_management*/
 
 /**
@@ -10050,10 +10012,8 @@ proto_register_zbee_zcl_device_management(void)
 void
 proto_reg_handoff_zbee_zcl_device_management(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_DEVICE_MANAGEMENT, device_management_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_device_management,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_DEVICE_MANAGEMENT,
+                            proto_zbee_zcl_device_management,
                             ett_zbee_zcl_device_management,
                             ZBEE_ZCL_CID_DEVICE_MANAGEMENT,
                             hf_zbee_zcl_device_management_attr_id,
@@ -10113,8 +10073,6 @@ static void dissect_zcl_events_clear_event_log_response         (tvbuff_t *tvb,
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t events_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_events = -1;
 
@@ -10571,7 +10529,7 @@ proto_register_zbee_zcl_events(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Events dissector. */
-    events_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_EVENTS, dissect_zbee_zcl_events, proto_zbee_zcl_events);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_EVENTS, dissect_zbee_zcl_events, proto_zbee_zcl_events);
 } /*proto_register_zbee_zcl_events*/
 
 /**
@@ -10581,10 +10539,8 @@ proto_register_zbee_zcl_events(void)
 void
 proto_reg_handoff_zbee_zcl_events(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_EVENTS, events_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_events,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_EVENTS,
+                            proto_zbee_zcl_events,
                             ett_zbee_zcl_events,
                             ZBEE_ZCL_CID_EVENTS,
                             hf_zbee_zcl_events_attr_id,
@@ -10637,8 +10593,6 @@ static void dissect_zcl_mdu_pairing_response(tvbuff_t *tvb, proto_tree *tree, gu
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t mdu_pairing_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_mdu_pairing = -1;
 
@@ -10887,7 +10841,7 @@ proto_register_zbee_zcl_mdu_pairing(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL MDU Pairing dissector. */
-    mdu_pairing_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_MDU_PAIRING, dissect_zbee_zcl_mdu_pairing, proto_zbee_zcl_mdu_pairing);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_MDU_PAIRING, dissect_zbee_zcl_mdu_pairing, proto_zbee_zcl_mdu_pairing);
 } /*proto_register_zbee_zcl_mdu_pairing*/
 
 /**
@@ -10897,10 +10851,8 @@ proto_register_zbee_zcl_mdu_pairing(void)
 void
 proto_reg_handoff_zbee_zcl_mdu_pairing(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_MDU_PAIRING, mdu_pairing_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_mdu_pairing,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_MDU_PAIRING,
+                            proto_zbee_zcl_mdu_pairing,
                             ett_zbee_zcl_mdu_pairing,
                             ZBEE_ZCL_CID_MDU_PAIRING,
                             hf_zbee_zcl_mdu_pairing_attr_id,
@@ -10957,8 +10909,6 @@ static void dissect_zcl_sub_ghz_suspend_zcl_messages(tvbuff_t *tvb, proto_tree *
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t sub_ghz_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_sub_ghz = -1;
 
@@ -11144,7 +11094,7 @@ proto_register_zbee_zcl_sub_ghz(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Sub-Ghz dissector. */
-    sub_ghz_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_SUB_GHZ, dissect_zbee_zcl_sub_ghz, proto_zbee_zcl_sub_ghz);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_SUB_GHZ, dissect_zbee_zcl_sub_ghz, proto_zbee_zcl_sub_ghz);
 } /*proto_register_zbee_zcl_sub_ghz*/
 
 /**
@@ -11154,10 +11104,8 @@ proto_register_zbee_zcl_sub_ghz(void)
 void
 proto_reg_handoff_zbee_zcl_sub_ghz(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_SUB_GHZ, sub_ghz_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_sub_ghz,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_SUB_GHZ,
+                            proto_zbee_zcl_sub_ghz,
                             ett_zbee_zcl_sub_ghz,
                             ZBEE_ZCL_CID_SUB_GHZ,
                             hf_zbee_zcl_sub_ghz_attr_id,
@@ -11244,8 +11192,6 @@ void proto_reg_handoff_zbee_zcl_ke(void);
 /* Global Variables      */
 /*************************/
 
-static dissector_handle_t ke_handle;
-
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_ke = -1;
 static int hf_zbee_zcl_ke_srv_tx_cmd_id = -1;
@@ -11714,7 +11660,7 @@ proto_register_zbee_zcl_ke(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Key Establishment dissector. */
-    ke_handle = register_dissector(ZBEE_PROTOABBREV_ZCL_KE, dissect_zbee_zcl_ke, proto_zbee_zcl_ke);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_KE, dissect_zbee_zcl_ke, proto_zbee_zcl_ke);
 } /*proto_register_zbee_zcl_ke*/
 
 /**
@@ -11724,10 +11670,8 @@ proto_register_zbee_zcl_ke(void)
 void
 proto_reg_handoff_zbee_zcl_ke(void)
 {
-    /* Register our dissector with the ZigBee application dissectors. */
-    dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_KE, ke_handle);
-
-    zbee_zcl_init_cluster(  proto_zbee_zcl_ke,
+    zbee_zcl_init_cluster(  ZBEE_PROTOABBREV_ZCL_KE,
+                            proto_zbee_zcl_ke,
                             ett_zbee_zcl_ke,
                             ZBEE_ZCL_CID_KE,
                             hf_zbee_zcl_ke_attr_id,
diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c
index 52b7bc24f0..6dda9b80cd 100644
--- a/epan/dissectors/packet-zbee-zcl.c
+++ b/epan/dissectors/packet-zbee-zcl.c
@@ -2322,24 +2322,31 @@ void proto_reg_handoff_zbee_zcl(void)
  *@param  fn_attr_data specific cluster attribute data decode function
 */
 void
-zbee_zcl_init_cluster(int proto, gint ett, guint16 cluster_id, int hf_attr_id, int hf_cmd_rx_id, int hf_cmd_tx_id, zbee_zcl_fn_attr_data fn_attr_data)
+zbee_zcl_init_cluster(const char *proto_abbrev, int proto, gint ett, guint16 cluster_id, int hf_attr_id, int hf_cmd_rx_id, int hf_cmd_tx_id, zbee_zcl_fn_attr_data fn_attr_data)
 {
     zbee_zcl_cluster_desc *cluster_desc;
-    cluster_desc  = g_new(zbee_zcl_cluster_desc, 1);
+    dissector_handle_t dissector_handle;
 
+    /* Register the dissector with the ZigBee application dissectors. */
+    dissector_handle = find_dissector(proto_abbrev);
+    dissector_add_uint("zbee.zcl.cluster", cluster_id, dissector_handle);
+
+    /* Allocate a cluster descriptor */
+    cluster_desc = g_new(zbee_zcl_cluster_desc, 1);
+
+    /* Initialize the cluster descriptor */
+    cluster_desc->proto_id = proto;
     cluster_desc->proto = find_protocol_by_id(proto);
     cluster_desc->name = proto_get_protocol_short_name(cluster_desc->proto);
+    cluster_desc->ett = ett;
     cluster_desc->cluster_id = cluster_id;
     cluster_desc->hf_attr_id = hf_attr_id;
     cluster_desc->hf_cmd_rx_id = hf_cmd_rx_id;
     cluster_desc->hf_cmd_tx_id = hf_cmd_tx_id;
     cluster_desc->fn_attr_data = fn_attr_data;
-    acluster_desc = g_list_append(acluster_desc, cluster_desc);
 
-    cluster_desc->proto_id = proto;
-    cluster_desc->ett = ett;
-
-    return;
+    /* Add the cluster descriptor to the list */
+    acluster_desc = g_list_append(acluster_desc, cluster_desc);
 }
 
 /**
diff --git a/epan/dissectors/packet-zbee-zcl.h b/epan/dissectors/packet-zbee-zcl.h
index d625110f29..b1435eb992 100644
--- a/epan/dissectors/packet-zbee-zcl.h
+++ b/epan/dissectors/packet-zbee-zcl.h
@@ -203,7 +203,7 @@ void decode_zcl_time_in_100ms (gchar *s, guint16 value);
 void decode_zcl_time_in_seconds (gchar *s, guint16 value);
 void decode_zcl_time_in_minutes (gchar *s, guint16 value);
 void dissect_zcl_attr_data (tvbuff_t *tvb, proto_tree *tree, guint *offset, guint data_type);
-void zbee_zcl_init_cluster(int proto, gint ett, guint16 cluster_id, int hf_attr_id, int hf_cmd_rx_id, int hf_cmd_tx_id, zbee_zcl_fn_attr_data fn_attr_data);
+void zbee_zcl_init_cluster(const char *proto_abbrev, int proto, gint ett, guint16 cluster_id, int hf_attr_id, int hf_cmd_rx_id, int hf_cmd_tx_id, zbee_zcl_fn_attr_data fn_attr_data);
 zbee_zcl_cluster_desc *zbee_zcl_get_cluster_desc(guint16 cluster_id);
 
 /* Cluster-specific commands and parameters */