Small refactoring.  Working on methods for spell movement, removal, and
timers.