ENH: Much simpler EDF wrapper