Update after second @jpountz review