This is better. If we're going to be packing up these structures more often in the code, then some helper classes to hide all the casting and cruft would be nice, but not required for this commit. http://llvm-reviews.chandlerc.com/D1144