More cleanup on GenerateAnnotationsFromFData