Bug #3327 Make do_when_will_live_with_you work with all related instruments