A great deal of cleanup. EUnit and EQC tests pass.