Cleaned up code on new machine.
Corrected some imports that seemed to get a little confused during the
previous merge.