Feature #4977: Improve function definition