Improve dynamically added function calling.