Passive cast-without-target improved

It should be easier to deal with now.