Motivation: Code introduced in 6152990073 can be cleaned up and use array initializer expressions. Modifications: Use array initializer expressions. Result: Cleaner code.
6152990073