Removing reliance on C++11 features for older compiler support (e.g. mingw)