Final fixes to inheritance + binding code.