be more restrictive for #835 bug workaround, AVX-only. Make handling of invalids separate.