I've changed my typing of Hitchens from ENTJ to ENTP. This is because I recalled an interview with Hitchens in his study, and it was a shambolic mess with piles and piles of books, papers, notes etc arranged in no particular order. Also, the man seems determined to go against the flow, just for the sake of argument - attacking Mother Teresa, Kissinger, God etc, and I remember hearing that Hitchens will just argue against anything for the sake of being contrarian! J's seem more likely to tow the line, and whilst that would by no means define the man as a P in itself, I think in addition to how disorganised his room was, he can be safely typed as a P.