[MRG] Tackle remaining comments in #3411

A few comments were not tackled before #3411 was merged. Now is the pull request to do that.