OK, the habeas corpus thing does seem to apply to only non-citizens, but would include legal aliens in HR 6166. The definition in S 3930 is not clear on that point.

3) LAWFUL ENEMY COMBATANT- The term `lawful enemy combatant' means an individual who is--

`(A) a member of the regular forces of a State party engaged in hostilities against the United States;

`(B) a member of a militia, volunteer corps, or organized resistance movement belonging to a State party engaged in such hostilities, which are under responsible command, wear a fixed distinctive sign recognizable at a distance, carry their arms openly, and abide by the law of war; or

`(C) a member of a regular armed force who professes allegiance to a government engaged in such hostilities, but not recognized by the United States.

4) UNLAWFUL ENEMY COMBATANT- The term `unlawful enemy combatant' means an individual engaged in hostilities against the United States who is not a lawful enemy combatant.

In addition there seem to be other differences in S 3930 and HR 6166 that will require conference.