I agree with @zeroSteiner at #2529's review. An ARCH_CMD target would be definitely the way of deal with that. Maybe you're missing a cmd/windows/generic payload. If it's the case, we can add it I guess. On the other hand if there is an ARCH_CMD target it should be tested with other ARCH_CMD windows payloads. If it isn't reliable, prolly adding this CMD option won't be reliable neither.