Core/Spells: Small cleanup