Migrate to new fixed length array syntax