Further rewrite work.