Small cleanup of FunctionDescriptor