Preparation for database schema simplifications: disambiguate queries on `state_key`.