Updating: improving closure-function construction