Attempt to fix problems noted in phpcs.

Seen at
https://integration.wikimedia.org/ci/job/mediawiki-core-regression-phpcs-HEAD/3256/console

Change-Id: If1272366fa242ccdf1191ba1686f2d1cdf046872