Small cleanup to StoreHandler.