Make -std=c++11 fix work on clang too. Remove a workaround for older GCC.