Finish purging the array sizes from the metadata.  Remove a temporary hack.