fix nested types in .srv definitions