Implement LWG issue 2061