Don't do regular checkpointing inside :DICT-CHECKPOINT
Add combined regular/dict checkpoint form
Use combined checkpoint in :OPT