Updated to use the yielded pstore.