Localizer: Address GaelVaroquaux's comments.