Minor internal changes.