Refactor some aggregate processing code, make sure I do not break anything else; Fix the EE valgrind error