Remove a few more calls to TargetMachine::getSubtarget from the