StateHistorySink: fix a few things