More cleanup of SelectBinding