Progress on stateful model rewrite.