fix: some aspects of the refactoring that were omitted on first attempt.
fix: some aspects of the refactoring that were omitted on first attempt.

Signed-off-by: Jon Seymour <44f878afe53efc66b76772bd845eb65944ed8232@ninjablocks.co>

ninjasphere/driver-go-zigbee,ninjasphere/driver-go-zigbee