Issue #2857822 by alexpott, klausi: Fix coding standards issues introduced mostly by array syntax conversion