Fix spurious extra return errors slightly.

Assume that a return always returns the correct type for the current
function.