Fix the build with MSVC 2013 after new shuffle code