Move the various Subtarget dependent members down to the subtarget