Use \method not \S3method
Eliminate all uses of match.fun. #137