More refactoring.  We do what we must, because we can.  Also, more work on getting tutorial to play nicely, including some fixes for combat, retreat, and dialogue functions.
Some work on general plan-priority calculations intended to give more emphasis to skills and traits, plus sundry tweaks and cleanup.