Removed AVX code, since it had very little effect on performance and would have required a more complicated build process. Also worked around a compilation error with clang.
