Support AVX2

... and clean up related code a bit