Fix AggPlus.h
Defuzz classes