Cleaned up some examples in chs 2 & 6.