Set proposals/IDs.
Cleanup.
Merge branch `rewrite` into `master`.