Exercise 2.89: Rewrite the answer

The old answer uses two representations for terms.  It makes things
complicated.  Simplify the answer to use a single representation.