All existing usages I could find do, so while this is API-breaking, it shouldn't need much work, and protects against accidental argument mix ups.