Improve would_forfeit semantics
Fix errors on guest logout