Make the handling of actions that produce multiple targets more correct.

[SVN r86561]