Simplify support for user-level checkpointing to simplify [K]VM-enable checkpointing later.
Missed from previous commit.