Attempt to fix problems noted in phpcs.

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

Change-Id: I1bcec887849f726cf0015a3a3a44bfc1f797658c