Yes. I would add that Die Hard 4 screwed up by making Justin Long the brains and McClane the muscle. In the first three McClane is both - he succeeds more through outsmarting his opponents than physical prowess. But DH4 makes him a doofus with a gun.