Improve logging and support performance-meters.