Refactor|Bindings|Client: Internalized more BindContext functionality