Use transitivity tactic, and other cleanup.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
Exercise 1.7

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>