Misc cleanup; remove A20 test (enabling it twice will hopefully be inconsequential).