Update several buff/debuff spell IDs.

Also clean up some strange code.