Fix: willpower message at vampire.

Plus a little cleanup.