Make it take parameters just like all the callers have, instead of
making them create a different structure.

It is now only used in tests.