Refactor computation of whether a variable declaration's type should be merged

with a prior declaration. No functionality change intended.

llvm-svn: 189850