Remove some AddedComplexity tags that were forcing priority for AVX over SSE. Use predicates instead.