SOme cleanup and improvements to the binding generator.