Merge pull request #1 from danleh/main

Reduce code duplication in Wasm runner