make-fun optimization