Remove some more short array syntax