A bit more wiggling to prevent asking about the target

architecture when possible, since we already know the
correct answer.