Matrix transform for persistent vectors
Stop emap on scalars from producing lists