Merge pull request #153 from kripken/wasm-only-more

More wasm-only opts