Also improve wording a bit and fix make check in --with-libstdc++=yes.