Refactor this method a bit, and correct a test that was completely wrong but happened to work out anyways. :-)

llvm-svn: 47321