labath accepted this revision. This revision is now accepted and ready to land. I'm not absolutely sure if moving the StringExtractor was the right choice on my part, but this does definitely does not make it worse. http://reviews.llvm.org/D10995