Simplify and use short array syntax.