Improved the alignment handling - should now deal with AVX as well as enforcing natural alignment.