Addresses O'Reilly editor comments.

Change-Id: I11f44681fb6801e6c4d2f5bea8c6b37c22d1001f