Adjusted to use efa.core.Unerased