Unify normal and pre-* action state dumps

This ensures that the pre-* action state dumps are rolled the same way
as the normal state dumps.

(I thought I would simplify the calling interface of the `dump()` method as well.)