Fixed definitions of some function objects.