It's been a while since I've seen the Donner cut but all of this sounds very reasonable. My only addition is that Lester's "General, would you care to step outside" must be included, as Reeve's delivery strikes a perfect "polite badass" tone.