Add check for keep_llvm_debug + minor touchups.