Some more basic work on the spell system.