Code cleanup

No functional changes.

Except spells2.c.  Reordering the items in the 'if' statement in
set_recall() means the expensive pointer accesses don't happen in NPP
mode.