GUVNOR-2122: Ensure existing bindings are correctly selected.