Common rewriter work.
Additional tests against the closure analysis.