Hah, that was the first approach that I took. The problem ended up being that the psuedo-expansion occurred too early, and the instruction was still split up :-(. If there is a generic way to handle all the possible cases, that would most certainly be the preferred. http://llvm-reviews.chandlerc.com/D3254