Swap argument order to match convention.

Fixes #1595.
Merge pull request #1601 from braddunbar/argument-order

Swap argument order to match convention.