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