Factored out all specific references to EFN.