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