Re-apply r346985: [ADT] Drop llvm::Optional clang-specific optimization for trivially...