Fixes for multiples of target skill + Nevermore

[yekoc]

Handles some edge cases for the new optionally-slot-independent way of finding target skills,ensures Heretic doesn't get skills taken away.