I agree. This debate over prisoners held in U.S. jails hinges on the legal status of the prisoners: military personnel vs. criminals.
Historically, military personnel have been employeed by a military organization, and paid for services, provided a uniform, weapons and food. Behavior is controlled via a code of ethics and military legal code. Violators are subject to imprisonment.
Criminals operate more loosely, perhpas like organized crime -- drug lords, or the mafia. Behavior is controlled by a code of ethics and allegiance to the boss. Violators are subject to death.
I feel the difficulty with this situation really hinges on Bush insisting that his terror prisoners were neither military personnel nor criminals. Bush wanted a new legal classification for his prisoners: enemy combatants.
For me, Bush's prisoners were indeed international criminals. They should not be classified as military prisoners.