Explicit state machine > half-assed collection of ints and None

Change-Id: Ia1f5a19d068d56aa72750b66e81f0e30c7732e85