Merge pull request #1487 from mbebenita/avx

Cleanups.
Merge branch 'nat' of https://github.com/mozilla/shumway into avx