Adjusted to efa.core.syntax renames