Adressing Hadley Wickham's suggestions to #927