Let me know if this looks good or if I should send smaller patches. This one ended up being large because I wanted to make it complete enough that I could answer questions about all the edge cases. :) http://llvm-reviews.chandlerc.com/D613