Fix prepare requests.
Diary entry.
Cleanup and NACK requests.
Merge branch `rewrite` into `master`.