Bug 6859 #5 Binding generator v1 refactoring