Some internal interface changes.