[FOLD] Convert static make_ to free functions