Update for use with new SpellTemplate interface

Cleaner!