Merge pull request #2475 from quickfur/issue13402

Eliminate C-style array declarations.