Future-proofed for C++11