Using the proper helper function instead of manually doing this work. No...

Using the proper helper function instead of manually doing this work. No functional changes intended.

llvm-svn: 198421