diff --git a/.swift-version b/.swift-version
index 7d5c902..bf77d54 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-4.1
+4.2
diff --git a/.travis.yml b/.travis.yml
index 845282e..0e320cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,18 +5,19 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode9.3
+      osx_image: xcode10
       before_install:
         - git submodule update --init --recursive
         - pushd Utilities
         - ./compile.sh
         - popd
       script:
-        - pod lib lint
+# FIXME: Re-enable when pods 1.6.0 is out of beta
+#        - pod lib lint
         - carthage build --no-skip-current
     - os: osx
       language: objective-c
-      osx_image: xcode9.3
+      osx_image: xcode10
       before_install:
         - git submodule update --init --recursive
         - pushd Utilities
@@ -36,9 +37,9 @@ matrix:
       before_install:
         - git submodule update --init --recursive
         - wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
-        - wget https://swift.org/builds/swift-4.1-release/ubuntu1404/swift-4.1-RELEASE/swift-4.1-RELEASE-ubuntu14.04.tar.gz 
-        - tar xzf swift-4.1-RELEASE-ubuntu14.04.tar.gz
-        - export PATH=${PWD}/swift-4.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
+        - wget https://swift.org/builds/swift-4.2-release/ubuntu1404/swift-4.2-RELEASE/swift-4.2-RELEASE-ubuntu14.04.tar.gz
+        - tar xzf swift-4.2-RELEASE-ubuntu14.04.tar.gz
+        - export PATH=${PWD}/swift-4.2-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
         - pushd Utilities
         - ./compile.sh
         - popd
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 11ebc19..0cb4861 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1 +1 @@
-github "trill-lang/FileCheck" "0.0.4"
+github "trill-lang/FileCheck" "0.0.8"
diff --git a/Carthage/Checkouts/FileCheck b/Carthage/Checkouts/FileCheck
index 0830734..89b8480 160000
--- a/Carthage/Checkouts/FileCheck
+++ b/Carthage/Checkouts/FileCheck
@@ -1 +1 @@
-Subproject commit 083073480112406580f0242036a079f9f8b170ad
+Subproject commit 89b8480055f9adf8ce2f9ad5e2fac7ac1076242e
diff --git a/Package.swift b/Package.swift
index 2afb8c5..003c2d8 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.1
+// swift-tools-version:4.2
 
 import PackageDescription
 
diff --git a/Sources/SwiftCheck/Cartesian.swift b/Sources/SwiftCheck/Cartesian.swift
index 67699df..47db722 100644
--- a/Sources/SwiftCheck/Cartesian.swift
+++ b/Sources/SwiftCheck/Cartesian.swift
@@ -28,17 +28,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, transform : @escaping (A1, A2, A3) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -65,18 +54,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, transform : @escaping (A1, A2, A3, A4) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -105,19 +82,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, transform : @escaping (A1, A2, A3, A4, A5) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -148,20 +112,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, transform : @escaping (A1, A2, A3, A4, A5, A6) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -194,21 +144,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -243,22 +178,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -295,23 +214,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -350,24 +252,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -408,25 +292,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -469,26 +334,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	/// - parameter ga12: A generator of values of type `A12`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, _ ga12 : Gen<A12>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, ga12, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -533,27 +378,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	/// - parameter ga12: A generator of values of type `A12`.
-	/// - parameter ga13: A generator of values of type `A13`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, _ ga12 : Gen<A12>, _ ga13 : Gen<A13>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, ga12, ga13, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -600,28 +424,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	/// - parameter ga12: A generator of values of type `A12`.
-	/// - parameter ga13: A generator of values of type `A13`.
-	/// - parameter ga14: A generator of values of type `A14`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, _ ga12 : Gen<A12>, _ ga13 : Gen<A13>, _ ga14 : Gen<A14>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, ga12, ga13, ga14, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -670,29 +472,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	/// - parameter ga12: A generator of values of type `A12`.
-	/// - parameter ga13: A generator of values of type `A13`.
-	/// - parameter ga14: A generator of values of type `A14`.
-	/// - parameter ga15: A generator of values of type `A15`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, _ ga12 : Gen<A12>, _ ga13 : Gen<A13>, _ ga14 : Gen<A14>, _ ga15 : Gen<A15>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, ga12, ga13, ga14, ga15, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -743,30 +522,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	/// - parameter ga12: A generator of values of type `A12`.
-	/// - parameter ga13: A generator of values of type `A13`.
-	/// - parameter ga14: A generator of values of type `A14`.
-	/// - parameter ga15: A generator of values of type `A15`.
-	/// - parameter ga16: A generator of values of type `A16`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, _ ga12 : Gen<A12>, _ ga13 : Gen<A13>, _ ga14 : Gen<A14>, _ ga15 : Gen<A15>, _ ga16 : Gen<A16>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, ga12, ga13, ga14, ga15, ga16, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -819,31 +574,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	/// - parameter ga12: A generator of values of type `A12`.
-	/// - parameter ga13: A generator of values of type `A13`.
-	/// - parameter ga14: A generator of values of type `A14`.
-	/// - parameter ga15: A generator of values of type `A15`.
-	/// - parameter ga16: A generator of values of type `A16`.
-	/// - parameter ga17: A generator of values of type `A17`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, _ ga12 : Gen<A12>, _ ga13 : Gen<A13>, _ ga14 : Gen<A14>, _ ga15 : Gen<A15>, _ ga16 : Gen<A16>, _ ga17 : Gen<A17>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, ga12, ga13, ga14, ga15, ga16, ga17, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -898,32 +628,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	/// - parameter ga12: A generator of values of type `A12`.
-	/// - parameter ga13: A generator of values of type `A13`.
-	/// - parameter ga14: A generator of values of type `A14`.
-	/// - parameter ga15: A generator of values of type `A15`.
-	/// - parameter ga16: A generator of values of type `A16`.
-	/// - parameter ga17: A generator of values of type `A17`.
-	/// - parameter ga18: A generator of values of type `A18`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, _ ga12 : Gen<A12>, _ ga13 : Gen<A13>, _ ga14 : Gen<A14>, _ ga15 : Gen<A15>, _ ga16 : Gen<A16>, _ ga17 : Gen<A17>, _ ga18 : Gen<A18>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, ga12, ga13, ga14, ga15, ga16, ga17, ga18, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -980,33 +684,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	/// - parameter ga12: A generator of values of type `A12`.
-	/// - parameter ga13: A generator of values of type `A13`.
-	/// - parameter ga14: A generator of values of type `A14`.
-	/// - parameter ga15: A generator of values of type `A15`.
-	/// - parameter ga16: A generator of values of type `A16`.
-	/// - parameter ga17: A generator of values of type `A17`.
-	/// - parameter ga18: A generator of values of type `A18`.
-	/// - parameter ga19: A generator of values of type `A19`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, _ ga12 : Gen<A12>, _ ga13 : Gen<A13>, _ ga14 : Gen<A14>, _ ga15 : Gen<A15>, _ ga16 : Gen<A16>, _ ga17 : Gen<A17>, _ ga18 : Gen<A18>, _ ga19 : Gen<A19>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, ga12, ga13, ga14, ga15, ga16, ga17, ga18, ga19, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -1065,34 +742,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	/// - parameter ga12: A generator of values of type `A12`.
-	/// - parameter ga13: A generator of values of type `A13`.
-	/// - parameter ga14: A generator of values of type `A14`.
-	/// - parameter ga15: A generator of values of type `A15`.
-	/// - parameter ga16: A generator of values of type `A16`.
-	/// - parameter ga17: A generator of values of type `A17`.
-	/// - parameter ga18: A generator of values of type `A18`.
-	/// - parameter ga19: A generator of values of type `A19`.
-	/// - parameter ga20: A generator of values of type `A20`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, _ ga12 : Gen<A12>, _ ga13 : Gen<A13>, _ ga14 : Gen<A14>, _ ga15 : Gen<A15>, _ ga16 : Gen<A16>, _ ga17 : Gen<A17>, _ ga18 : Gen<A18>, _ ga19 : Gen<A19>, _ ga20 : Gen<A20>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, ga12, ga13, ga14, ga15, ga16, ga17, ga18, ga19, ga20, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -1153,35 +802,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	/// - parameter ga12: A generator of values of type `A12`.
-	/// - parameter ga13: A generator of values of type `A13`.
-	/// - parameter ga14: A generator of values of type `A14`.
-	/// - parameter ga15: A generator of values of type `A15`.
-	/// - parameter ga16: A generator of values of type `A16`.
-	/// - parameter ga17: A generator of values of type `A17`.
-	/// - parameter ga18: A generator of values of type `A18`.
-	/// - parameter ga19: A generator of values of type `A19`.
-	/// - parameter ga20: A generator of values of type `A20`.
-	/// - parameter ga21: A generator of values of type `A21`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, _ ga12 : Gen<A12>, _ ga13 : Gen<A13>, _ ga14 : Gen<A14>, _ ga15 : Gen<A15>, _ ga16 : Gen<A16>, _ ga17 : Gen<A17>, _ ga18 : Gen<A18>, _ ga19 : Gen<A19>, _ ga20 : Gen<A20>, _ ga21 : Gen<A21>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, ga12, ga13, ga14, ga15, ga16, ga17, ga18, ga19, ga20, ga21, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
@@ -1244,36 +864,6 @@ extension Gen /*: Cartesian*/ {
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-	/// - parameter ga1: A generator of values of type `A1`.
-	/// - parameter ga2: A generator of values of type `A2`.
-	/// - parameter ga3: A generator of values of type `A3`.
-	/// - parameter ga4: A generator of values of type `A4`.
-	/// - parameter ga5: A generator of values of type `A5`.
-	/// - parameter ga6: A generator of values of type `A6`.
-	/// - parameter ga7: A generator of values of type `A7`.
-	/// - parameter ga8: A generator of values of type `A8`.
-	/// - parameter ga9: A generator of values of type `A9`.
-	/// - parameter ga10: A generator of values of type `A10`.
-	/// - parameter ga11: A generator of values of type `A11`.
-	/// - parameter ga12: A generator of values of type `A12`.
-	/// - parameter ga13: A generator of values of type `A13`.
-	/// - parameter ga14: A generator of values of type `A14`.
-	/// - parameter ga15: A generator of values of type `A15`.
-	/// - parameter ga16: A generator of values of type `A16`.
-	/// - parameter ga17: A generator of values of type `A17`.
-	/// - parameter ga18: A generator of values of type `A18`.
-	/// - parameter ga19: A generator of values of type `A19`.
-	/// - parameter ga20: A generator of values of type `A20`.
-	/// - parameter ga21: A generator of values of type `A21`.
-	/// - parameter ga22: A generator of values of type `A22`.
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, _ ga3 : Gen<A3>, _ ga4 : Gen<A4>, _ ga5 : Gen<A5>, _ ga6 : Gen<A6>, _ ga7 : Gen<A7>, _ ga8 : Gen<A8>, _ ga9 : Gen<A9>, _ ga10 : Gen<A10>, _ ga11 : Gen<A11>, _ ga12 : Gen<A12>, _ ga13 : Gen<A13>, _ ga14 : Gen<A14>, _ ga15 : Gen<A15>, _ ga16 : Gen<A16>, _ ga17 : Gen<A17>, _ ga18 : Gen<A18>, _ ga19 : Gen<A19>, _ ga20 : Gen<A20>, _ ga21 : Gen<A21>, _ ga22 : Gen<A22>, transform : @escaping (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(ga1, ga2, ga3, ga4, ga5, ga6, ga7, ga8, ga9, ga10, ga11, ga12, ga13, ga14, ga15, ga16, ga17, ga18, ga19, ga20, ga21, ga22, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///
diff --git a/Sources/SwiftCheck/Check.swift b/Sources/SwiftCheck/Check.swift
index ec78ee5..60635f3 100644
--- a/Sources/SwiftCheck/Check.swift
+++ b/Sources/SwiftCheck/Check.swift
@@ -194,15 +194,6 @@ public func <- (checker : ReportiveQuickCheck, test : @autoclosure @escaping ()
 	_ = quickCheckWithResult(checker.args, test())
 }
 
-/// Tests a property and prints the results to stdout.
-///
-/// - parameter prop: The property to be tested.
-/// - parameter name: The name of the property being tested.
-@available(*, deprecated, message: "Use quickCheck(asserting:) or quickCheck(reporting:) instead.")
-public func quickCheck(_ prop : Testable, name : String = "") {
-	_ = quickCheckWithResult(CheckerArguments(name: name), prop)
-}
-
 /// The interface for properties to be run through SwiftCheck with an XCTest
 /// assert.  The property will still generate console output during testing.
 ///
diff --git a/Sources/SwiftCheck/Gen.swift b/Sources/SwiftCheck/Gen.swift
index 4f5f0db..a13dfa9 100644
--- a/Sources/SwiftCheck/Gen.swift
+++ b/Sources/SwiftCheck/Gen.swift
@@ -172,10 +172,6 @@ extension Gen {
 		}
 	}
 
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<A1, A2>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, transform: @escaping (A1, A2) -> A) -> Gen {
-		return Gen.zipWith(ga1, ga2, transform: transform)
-	}
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	public static func zipWith<A1, A2>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, transform: @escaping (A1, A2) -> A) -> Gen {
diff --git a/SwiftCheck.xcodeproj/project.pbxproj b/SwiftCheck.xcodeproj/project.pbxproj
index a0fe41b..f4dfd6d 100644
--- a/SwiftCheck.xcodeproj/project.pbxproj
+++ b/SwiftCheck.xcodeproj/project.pbxproj
@@ -847,7 +847,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -880,7 +880,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
@@ -903,7 +903,7 @@
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Debug;
@@ -923,7 +923,7 @@
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1062,7 +1062,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1095,7 +1095,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1120,7 +1120,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1142,7 +1142,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1178,7 +1178,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2,3";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1212,7 +1212,7 @@
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2,3";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
@@ -1243,7 +1243,7 @@
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1266,7 +1266,7 @@
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
diff --git a/Templates/Cartesian.swift.gyb b/Templates/Cartesian.swift.gyb
index 9c46c50..bf887f6 100644
--- a/Templates/Cartesian.swift.gyb
+++ b/Templates/Cartesian.swift.gyb
@@ -51,17 +51,6 @@ zip_with_argument_list = ', '.join(['ga{0}'.format(n) for n in range(1, arity +
 			}
 	}
 
-	/// Returns a new generator that applies a given function to any outputs the
-	/// given generators produce.
-	///
-% for (t, p) in zip(types_list, ['ga{0}'.format(n) for n in range(1, arity + 1)]):
-	/// - parameter ${p}: A generator of values of type `${t}`.
-% end
-	@available(*, deprecated, renamed: "zipWith")
-	public static func map<${type_parameter_list}>(${parameter_list}, transform : @escaping (${type_parameter_list}) -> A) -> Gen<A> {
-		return Gen<A>.zipWith(${zip_with_argument_list}, transform: transform)
-	}
-
 	/// Returns a new generator that applies a given function to any outputs the
 	/// given generators produce.
 	///