Don't pass $arch when unnecessary