first step in removal of metric style field; remove compiler warning;

first step in removal of metric style field; remove compiler warning;
changed aggregation classes and implementation and updated clients to use
  new aggregation code;