Minor cleanup of final chapter.