Fixed errors resulting from poor reconciliation of changes.

Revert "Merge branch 'formatting_reconciliation' of git+ssh://github.com/niffiwan/wcsaga into formatting_reconciliation"

This reverts commit 4b08ff5d5bf2952d1b92b597a6d42d5f69585554, reversing
changes made to c3ebd895a26447c4d02fc1a1ef31fb9b54b048df.