More fixes for expanded array format...