Refactor generic function values a little.