Improved the performance measurement codes.