Use new semantics of multiple #[cfg(..)] attributes

Since they are being changed from union to intersect