Switch to new 0.14 style default arguments.