Merge branch `rewrite` into `master`.
Fix tests.
Diary entry.
Fix NACKs.
NACK testing.