Removed the modifier store, and adapted the aggregate store to replace
it.