Fix the way we store the state_only flag.