issue #22669: Various surgical operations to prevent duplicate bindings, and handle validation correctly.