Rewriting patch infrastructure.
Self-review