Cleanup syntax for chapter 11.