Sorry, I misinterpreted your comment to mean that we should omit the origin argument entirely, rather than simply making the switch from a static to a dynamic value.