Updated to support latest Clang option naming.