Fix regressions in Embedder.