Add define-types to simplify the signatures.