Quoting in checkpoints. Fixes #1