Better names for the functors in preparation for working with whole classes of them. This is going to be tough...