Minor reshuffling of ProcessorStore code