*9001* Make function descriptors consistent