More libstdc++ workarounds