Chapter-3 cleanup for final draft (WIP).