Small internal changes.