Improve bundle resolution
  * make sure the computed wiring is reused when actually resolving the bundles
  * refresh bundles if their wiring to not match the computed one