Changes for compat with LLVM output.