first step in removal of metric style field; cleaned up in various ways

first step in removal of metric style field; cleaned up in various ways
  changed aggregation classes and implementation and updated clients to use
new aggregation code; removed unneeded friend function declarations;
  created consistent metric update value functions