Initial mori-backed minimalist rewrite.