Made changes suggested by Ben S.
Made other changes suggested by Ben S.
Made changes suggested by Richard Peter.
Made change from Ben S.
Change-Id: Ic7eb146c30d8024b34782187318e79882fc963bd
Former-commit-id: 7457631795 [formerly 044b18a356] [formerly 7457631795 [formerly 044b18a356] [formerly 325f31f6ef [formerly a941dd68c3c5b42671ad78900d6d8f8231d70810]]]
Former-commit-id: 325f31f6ef
Former-commit-id: 6c9e4cc7a7 [formerly e391a0b41b]
Former-commit-id: 17aa893fc3
