C++11 and aliasing fixes.