More tweaking of PhpStorm settings. Minimal code changes.
committing changes that happened before PhpStorm expired