Further rewriting.