More work on support for ADC.