Yes, @agramfort I considered both those things, and reverting 721be7f8 would make it seem somewhat less frameworkish, in return for more repeated code. Apart from adding underscores, I'm happy with either of those and think they're much easier to read (and compare strategies) than playing with indices and inversions in each `__call__`.