Simplification and unification of function and unique_function
Simplification and unification of function and unique_function -- removal of old sources