Match JMH upstream API 'enhancements'