Did Bush pull a Kerry on the "Al Qaeda Bill of Rights"?

Did Bush flip-flop on the issue of whether or not Al Qaeda and other enemy combatants are entitled to Geneva Convention protections that terrorists do not confer to their victims? Surely there is a method to this apparent madness, right? Mario Loyola at National Review has a theory, which does seem to make sense:

The President just pulled one of the best maneuvers of his entire presidency. By transferring most major Al Qaeda terrorists to Guantanamo, and simultaneously sending Congress a bill to rescue the Military Commissions from the Supreme Court's ruling Hamdan v. Rumsfeld, the President spectacularly ambushed the Democrats on terrain they fondly thought their own. Now Democrats who oppose (and who have vociferously opposed) the Military Commissions will in effect be opposing the prosecution of the terrorists who planned and launched the attacks of September 11 for war crimes.

And if that were not enough, the President also frontally attacked the Hamdan ruling's potentially chilling effect on CIA extraordinary interrogation techniques, by arguing that Common Article 3 of the Geneva Conventions is too vague, and asking Congress to define clearly the criminal law limiting the scope of permissible interrogation.

Taken as a whole, the President's maneuver today turned the political tables completely around. He stole the terms of debate from the Democrats, and rewrote them, all in a single speech. It will be delightful to watch in coming days and hours as bewildered Democrats try to understand what just hit them, and then sort through the rubble of their anti-Bush national security strategy to see what, if anything, remains.

Time will tell.