Further rewrite changes.