More Header Nits

.. MetricAggregator declared getFirstLast() that basically
   doesn't exist (and no idea what it was for!)