Hoist options into explicit arguments

What do you think, @yihui?