@agramfort I think my last commit is even a better idea.