Ch 7 - fixes and simplications.

Not bug fixes, just removing unnecessary lines of code.