Fix style issues from a recent PR.
Fix some minor style issues in Attack*.