The one flaw in this argument is believing OBL to taking such a brazen decision to house himself in the middle of an army town. Waziristan is large and vast. If OBL had wanted to prevent his own death, he would have stayed in that area rather than expose himself to Pakistani authorities.
Bookmarks