Remove some else statements.