Fix previous, rebase into abiexec change.
Update 'wip' submodule.