clean up var/lent return types

clean up var/lent return types #17478