Is it worth removing all references to `scoped()` then?