Remove some unnecessary special-casing for misc combat info.
Clean up some redundant checks and use number_charging more.
Merge pull request #326 from ajps/restruct

Misc cleanup