Improve trap exit, allow draws.