Refactor computation of whether a variable declaration's type should be merged
with a prior declaration. No functionality change intended.
Switched FormatAttr to using an IdentifierArgument instead of a StringArgument since that is a more accurate modeling.