Fix restore-to-breakpoint bugs.

Fixes #231.
Fixes #232.