Initial binding cleanup using generics

Initial binding cleanup using generics #5683