Small improvements to Part 2.