Tweak defaults based on @yihui feedback