Remove the AttackSwallow Info field overloading.
Fix style issues from a recent PR.
Fix some minor style issues in Attack*.
Merge pull request #7123 from pchote/style-cleanup

Clean up some code style issues.