Prepared Chapter 7 for merge into main.