Swift: Widen the new sinks to cover more cases the MaD sinks are missing.