Be more careful about tree entry modes.