Merge branch `rewrite` into `master`.
Merge branch `rewrite` into `master`.
Diary entry.
Comments and cleanup.