Rejigger arguments, etc, and remove storing some ADC pointers when not needed.