Embedded collector (partial impl), fixes.