Restore the AD type to derive Num, etc. instances independently from choice of Mode. This fixes the broken tests.