Drop an unused message
Support more than 4 states

Tests pass, including a new one with AAs
Find another package
Merge branches 'additional-states' and 'annotate-protobuf'