Some improvements about TRUE/FALSE states.