Have kwarg order match that given in doc string
(#508)