diff --git a/substrate/executor/src/wasm_executor.rs b/substrate/executor/src/wasm_executor.rs
index ff4b1a31a269c86c6a16855f91e30c7c860cf783..5de36f7d2345377225d919f7606084a22cb42a2e 100644
--- a/substrate/executor/src/wasm_executor.rs
+++ b/substrate/executor/src/wasm_executor.rs
@@ -137,7 +137,7 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
 		} else { 0 }
 	},
 	ext_deposit_log(_log_data: *const u8, _log_len: u32) => {
-		unimplemented!()
+		// TODO
 	}
 	=> <'e, E: Externalities + 'e>
 );
diff --git a/substrate/executor/src/wasm_utils.rs b/substrate/executor/src/wasm_utils.rs
index 577e6ab0b23d64ea1be309c3602f470fa4a2c176..6d4fedfedbc94691679f36985fc78727db4d7fdb 100644
--- a/substrate/executor/src/wasm_utils.rs
+++ b/substrate/executor/src/wasm_utils.rs
@@ -75,13 +75,13 @@ macro_rules! reverse_params {
 
 #[macro_export]
 macro_rules! marshall {
-	( $context:ident, $self:ident, ( $( $names:ident : $params:ty ),* ) -> $returns:ty => $body:tt ) => ({
-		let r : <$returns as $crate::wasm_utils::ConvertibleToWasm>::NativeType = reverse_params!($body, $self, $context, $( $names : $params ),*);
-		Ok(Some({ use $crate::wasm_utils::ConvertibleToWasm; r.to_runtime_value() }))
-	});
 	( $context:ident, $self:ident, ( $( $names:ident : $params:ty ),* ) => $body:tt ) => ({
 		reverse_params!($body, $self, $context, $( $names : $params ),*);
 		Ok(None)
+	});
+	( $context:ident, $self:ident, ( $( $names:ident : $params:ty ),* ) -> $returns:ty => $body:tt ) => ({
+		let r : <$returns as $crate::wasm_utils::ConvertibleToWasm>::NativeType = reverse_params!($body, $self, $context, $( $names : $params ),*);
+		Ok(Some({ use $crate::wasm_utils::ConvertibleToWasm; r.to_runtime_value() }))
 	})
 }