Factor out more spellpowers