Simplify array creation.
Merge branch '4.0'