Add a more reliable check for whether a static declaration has already

been used.  In preparation for the fix to PR2360, but also a minor bug 
in its own right.

llvm-svn: 51583