CS fixes

- php-cs-fixer is being wonky about parens on the same line as an include
  statement, even when they are not part of the include statement itself. The
  changes here resolve all CS warnings.
Merge branch 'hotfix/cs-issues'