more cleanup of PersistentArrayMap enhancements