I'd vote to make these all keyword args. Also, if we can remove the defaults, I think that'd make it easier to read. Are they there for reasons other than testing? If not, I'd vote to remove.