Make routines take explicit args instead of `options={}`

[JP Slavinsky]

Will help us avoid errors where we think arguments are being used but they aren't.