More code cleanup [NFC]

Minor naming, one potentially unsafe cast

llvm-svn: 233359
1 file changed