Modified handling of current state messages to use set operations.