Clean up part of template type diffing. Moved repeated code to separate

functions.  Reworked one of the conditionals.  No functional changes.

llvm-svn: 164839