Merge "Code cleanup to avoid LLVM dependency when building with quick only."