Agreed, the arg index is not an optimal API, but was trying to be as minimal on code impact for the change. Open to other ideas though, if it is best to just bite the bullet and refactor the APIs more.