Refactor some more.

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