Code cleanup to shut PhpStorm warnings. No functionality changes.