You're right, I can add that for all but one case. But for SuperComponentViewModel, it calls two separate subscription functions that have callbacks to add to history. It's a good idea for all the other cases, but it doesn't resolve this last issue.