Made the choice numbering consistent with the 2-state and 3-state cases.