Improve discard-body logic