I decided that trying to enumerate style issues would take longer than just fixing them.

Besides style, there are some more substantial changes:

• I removed everybody besides you from the copyright notices for new files
• I removed two added but unused PS_OPT defines
• Some redundant initialization was reverted

If you are fine with this update, please indicate so. Modulo your approval, I consider the patch ready to commit.