diff --git a/cranelift/src/wasm.rs b/cranelift/src/wasm.rs
index 4dddddf65c..e0b4d17772 100644
--- a/cranelift/src/wasm.rs
+++ b/cranelift/src/wasm.rs
@@ -67,17 +67,14 @@ pub fn run(
     for filename in files {
         let path = Path::new(&filename);
         let name = String::from(path.as_os_str().to_string_lossy());
-        match handle_module(
+        handle_module(
             flag_verbose,
             flag_optimize,
             flag_check,
             path.to_path_buf(),
             name,
             &flags,
-        ) {
-            Ok(()) => {}
-            Err(message) => return Err(message),
-        }
+        )?;
     }
     Ok(())
 }
@@ -105,12 +102,9 @@ fn handle_module(
         Some(ext) => {
             match ext.to_str() {
                 Some("wasm") => {
-                    match read_wasm_file(path.clone()) {
-                        Ok(data) => data,
-                        Err(err) => {
-                            return Err(String::from(err.description()));
-                        }
-                    }
+                    read_wasm_file(path.clone()).map_err(|err| {
+                        String::from(err.description())
+                    })?
                 }
                 Some("wat") => {
                     let tmp_dir = TempDir::new("cretonne-wasm").unwrap();
@@ -127,12 +121,9 @@ fn handle_module(
                             return Err(String::from(e.description()));
                         })
                         .unwrap();
-                    match read_wasm_file(file_path) {
-                        Ok(data) => data,
-                        Err(err) => {
-                            return Err(String::from(err.description()));
-                        }
-                    }
+                    read_wasm_file(file_path).map_err(|err| {
+                        String::from(err.description())
+                    })?
                 }
                 None | Some(&_) => {
                     return Err(String::from("the file extension is not wasm or wat"));
@@ -143,12 +134,7 @@ fn handle_module(
     let mut dummy_runtime = DummyRuntime::with_flags(flags.clone());
     let translation = {
         let runtime: &mut WasmRuntime = &mut dummy_runtime;
-        match translate_module(&data, runtime) {
-            Ok(x) => x,
-            Err(string) => {
-                return Err(string);
-            }
-        }
+        translate_module(&data, runtime)?
     };
     terminal.fg(term::color::GREEN).unwrap();
     vprintln!(flag_verbose, " ok");
@@ -158,10 +144,9 @@ fn handle_module(
         vprint!(flag_verbose, "Checking...   ");
         terminal.reset().unwrap();
         for func in &translation.functions {
-            match verifier::verify_function(func, None) {
-                Ok(()) => (),
-                Err(err) => return Err(pretty_verifier_error(func, None, err)),
-            }
+            verifier::verify_function(func, None).map_err(|err| {
+                pretty_verifier_error(func, None, err)
+            })?;
         }
         terminal.fg(term::color::GREEN).unwrap();
         vprintln!(flag_verbose, " ok");
@@ -184,42 +169,22 @@ fn handle_module(
             context.cfg = cfg;
             context.domtree = domtree;
             context.loop_analysis = loop_analysis;
-            match verifier::verify_context(&context.func, &context.cfg, &context.domtree, None) {
-                Ok(()) => (),
-                Err(err) => {
-                    return Err(pretty_verifier_error(&context.func, None, err));
-                }
-            };
-            match context.licm() {
-                Ok(())=> (),
-                Err(error) => {
-                    match error {
-                        CtonError::Verifier(err) => {
-                            return Err(pretty_verifier_error(&context.func, None, err));
-                        }
-                        CtonError::InvalidInput |
-                        CtonError::ImplLimitExceeded |
-                        CtonError::CodeTooLarge => return Err(String::from(error.description())),
-                    }
-                }
-            };
-            match context.simple_gvn() {
-                Ok(())=> (),
-                Err(error) => {
-                    match error {
-                        CtonError::Verifier(err) => {
-                            return Err(pretty_verifier_error(&context.func, None, err));
-                        }
-                        CtonError::InvalidInput |
-                        CtonError::ImplLimitExceeded |
-                        CtonError::CodeTooLarge => return Err(String::from(error.description())),
-                    }
-                }
-            };
-            match verifier::verify_context(&context.func, &context.cfg, &context.domtree, None) {
-                Ok(()) => (),
-                Err(err) => return Err(pretty_verifier_error(&context.func, None, err)),
-            }
+            verifier::verify_context(&context.func, &context.cfg, &context.domtree, None)
+                .map_err(|err| pretty_verifier_error(&context.func, None, err))?;
+            context.licm().map_err(|error| match error {
+                CtonError::Verifier(err) => pretty_verifier_error(&context.func, None, err),
+                CtonError::InvalidInput |
+                CtonError::ImplLimitExceeded |
+                CtonError::CodeTooLarge => String::from(error.description()),
+            })?;
+            context.simple_gvn().map_err(|error| match error {
+                CtonError::Verifier(err) => pretty_verifier_error(&context.func, None, err),
+                CtonError::InvalidInput |
+                CtonError::ImplLimitExceeded |
+                CtonError::CodeTooLarge => String::from(error.description()),
+            })?;
+            verifier::verify_context(&context.func, &context.cfg, &context.domtree, None)
+                .map_err(|err| pretty_verifier_error(&context.func, None, err))?;
         }
         terminal.fg(term::color::GREEN).unwrap();
         vprintln!(flag_verbose, " ok");
diff --git a/lib/wasm/src/sections_translator.rs b/lib/wasm/src/sections_translator.rs
index 3df3e7e3d9..08f05eca79 100644
--- a/lib/wasm/src/sections_translator.rs
+++ b/lib/wasm/src/sections_translator.rs
@@ -39,19 +39,15 @@ pub fn parse_function_signatures(
                                           }) => {
                 let mut sig = Signature::new(CallConv::Native);
                 sig.argument_types.extend(params.iter().map(|ty| {
-                    let cret_arg: cretonne::ir::Type = match type_to_type(ty) {
-                        Ok(ty) => ty,
-                        Err(()) => panic!("only numeric types are supported in\
-                                      function signatures"),
-                    };
+                    let cret_arg: cretonne::ir::Type = type_to_type(ty).expect(
+                        "only numeric types are supported in function signatures",
+                    );
                     ArgumentType::new(cret_arg)
                 }));
                 sig.return_types.extend(returns.iter().map(|ty| {
-                    let cret_arg: cretonne::ir::Type = match type_to_type(ty) {
-                        Ok(ty) => ty,
-                        Err(()) => panic!("only numeric types are supported in\
-                                  function signatures"),
-                    };
+                    let cret_arg: cretonne::ir::Type = type_to_type(ty).expect(
+                        "only numeric types are supported in function signatures",
+                    );
                     ArgumentType::new(cret_arg)
                 }));
                 runtime.declare_signature(&sig);
diff --git a/lib/wasm/tests/testsuite.rs b/lib/wasm/tests/testsuite.rs
index 7234541b66..96d1a645ef 100644
--- a/lib/wasm/tests/testsuite.rs
+++ b/lib/wasm/tests/testsuite.rs
@@ -67,12 +67,7 @@ fn handle_module(path: PathBuf, isa: Option<&TargetIsa>) {
         }
         Some(ext) => {
             match ext.to_str() {
-                Some("wasm") => {
-                    match read_wasm_file(path.clone()) {
-                        Ok(data) => data,
-                        Err(err) => panic!("error reading wasm file: {}", err.description()),
-                    }
-                }
+                Some("wasm") => read_wasm_file(path.clone()).expect("error reading wasm file"),
                 Some("wat") => {
                     let tmp_dir = TempDir::new("cretonne-wasm").unwrap();
                     let file_path = tmp_dir.path().join("module.wasm");
@@ -104,12 +99,7 @@ fn handle_module(path: PathBuf, isa: Option<&TargetIsa>) {
                             }
                         }
                     }
-                    match read_wasm_file(file_path) {
-                        Ok(data) => data,
-                        Err(err) => {
-                            panic!("error reading converted wasm file: {}", err.description());
-                        }
-                    }
+                    read_wasm_file(file_path).expect("error reading converted wasm file")
                 }
                 None | Some(&_) => panic!("the file extension is not wasm or wat"),
             }
@@ -121,18 +111,12 @@ fn handle_module(path: PathBuf, isa: Option<&TargetIsa>) {
     };
     let translation = {
         let runtime: &mut WasmRuntime = &mut dummy_runtime;
-        match translate_module(&data, runtime) {
-            Ok(x) => x,
-            Err(string) => {
-                panic!(string);
-            }
-        }
+        translate_module(&data, runtime).unwrap()
     };
     for func in &translation.functions {
-        match verifier::verify_function(func, isa) {
-            Ok(()) => (),
-            Err(err) => panic!(pretty_verifier_error(func, isa, err)),
-        }
+        verifier::verify_function(func, isa)
+            .map_err(|err| panic!(pretty_verifier_error(func, isa, err)))
+            .unwrap();
     }
 }