Fix typos

Also consolidate 'backward compatibility'

llvm-svn: 212974
10 files changed