Bug 6859 #2 Binding generator v1 refactoring