Aligning brace.
Adding UNCONFIRMED state; Simplifying persistence for UNSUBSCRIBED state.
Adding UNCONFIRMED state; Simplifying persistence for UNSUBSCRIBED state.