More cleanup.
Get rid of one intermediate variable.
Get rid of another variable.
More cleanup.