Add dedicated structs for BindingKind
variants
#3672
+195
−71
Merged