Remove Function.name dependency