make the global functor stuff in the various constructions more uniform; change it such that barrier/proof does not have to repeat the functors it needs