Tweaked builder solution, upped closure-tulls lib