Changing some of the short array syntax back, damn 5.3