(partially) migrate Descriptors to use C++11 syntax