@agramfort and I had a hangout. All issues are resolved. See diff.