Improve types to reflect key-making functions may return undefined

Improve types to reflect key-making functions may return undefined #724