Move completely to short array syntax

This moves the 5.0 branch completely to the short array syntax. If #5863 goes through, I'll do this again.