More work on ObjectStore.

@devoncarew  PTAL