Updated for changes to Control.