Fix formatter issues with 'echo' calls and with 'short array' syntax