optimized call-sites; fixed builtin's men leak