Deal with state changes in a more consistent manner

Maybe capitalize flag since you capitalized Unflag?