Make llvm2cpp better, patch for PR1794, contributed by Zack Rusin.