More function definition fixes.