Beginning to rework the generated-function signatures.