$ 0 0 *MERGE* Various build- and code-reorg cleanups for ext/wasm. No functional changes. (tags: trunk)