Improve common/shuffle

 - Silence MSVC W4 warnings
 - Use make instead of iteratively call extract/insert