Do more to modernize MergeFunctions. Refactor in response to Chris' code review.