Add runstate swap helpers