Address GaelVaroquaux's comments.