Integrate additional binder refactoring code review feedback.