I think for clarity, then, it's easiest to return to something much more like the current implementation.