Core/Spells: Some cleanup and missing stuff in a6eee516bd07f6adf6e519fdb3171ac28b1058f6