Can't you do this in `current(..)`?