Addresses recent private discussions.

cc @larsmans @GaelVaroquaux @agramfort