Binding v2 - Cleanup AugmentToGentype