Bug 1531: Fixed incorrect use of leaf types in BindingGeneratorImpl