More fixes to vote logic.  Excised the last references to the enum that no longer exists.