bench: bring vanilla functionality closer to di
instantiator: refactor out closures