Fix struct member names and simplify. NFC.

llvm-svn: 270289
1 file changed