Minor refactoring in the HStoreThreadManager