[4.2] Short Array Syntax

This moves the 4.2 branch completely to the short array syntax.