Changes wrt comments from rogpeppe.