Issue #3246448: Fix cspell & phpcs failures caused by both becoming more strict