Remove more short array syntax