My thought, too.
How about one term for members of the House and Senate, also?
1 for the Senate and 2 for the House.