Clean up; fix setting of IA threshold and delay.