Bug 406716 - (part 2) - remove unresolved bindings after handling them