Use LLVM Unicode conversion. Improved extra headers parsing.